OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block: Fix bdrv_commit return value 

bdrv_commit() could return 0 or 1 on success, depending on whether or
not the last sector was allocated in the overlay and whether the overlay
format had a .bdrv_make_empty callback.

Most callers ignored it, but qemu-img commit would print an error
message while the operation actually succeeded.

Also clean up the handling of I/O errors to return the real error code
instead of -EIO.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
This commit is contained in:
Kevin Wolf 2014-01-24 14:00:43 +01:00
parent 3722290074
commit dabfa6cc2e
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
block.c
View File

@ -2089,13 +2089,13 @@ int bdrv_commit(BlockDriverState *bs)
goto ro_cleanup; goto ro_cleanup;
} }
if (ret) { if (ret) {
if (bdrv_read(bs, sector, buf, n) != 0) { ret = bdrv_read(bs, sector, buf, n);
ret = -EIO; if (ret < 0) {
goto ro_cleanup; goto ro_cleanup;
} }
if (bdrv_write(bs->backing_hd, sector, buf, n) != 0) { ret = bdrv_write(bs->backing_hd, sector, buf, n);
ret = -EIO; if (ret < 0) {
goto ro_cleanup; goto ro_cleanup;
} }
} }
@ -2103,6 +2103,9 @@ int bdrv_commit(BlockDriverState *bs)
if (drv->bdrv_make_empty) { if (drv->bdrv_make_empty) {
ret = drv->bdrv_make_empty(bs); ret = drv->bdrv_make_empty(bs);
if (ret < 0) {
goto ro_cleanup;
}
bdrv_flush(bs); bdrv_flush(bs);
} }
@ -2110,9 +2113,11 @@ int bdrv_commit(BlockDriverState *bs)
* Make sure all data we wrote to the backing device is actually * Make sure all data we wrote to the backing device is actually
* stable on disk. * stable on disk.
*/ */
if (bs->backing_hd) if (bs->backing_hd) {
bdrv_flush(bs->backing_hd); bdrv_flush(bs->backing_hd);
}
ret = 0;
ro_cleanup: ro_cleanup:
g_free(buf); g_free(buf);