mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-img: always goto out in img_snapshot() error paths

Browse Source 
The out label has the qemu_progress_end() and other cleanup calls.
Always goto out in error paths so the cleanup happens.  These error
paths now return 1 instead of -1.

Note that bdrv_unref(NULL) is safe.  We just need to initialize bs to
NULL at the top of the function.

We can now remove the obsolete bs_old_backing = NULL and bs_new_backing
= NULL for safe mode.  Originally it was necessary in commit 3e85c6fd
("qemu-img rebase") but became useless in commit c2abcce ("qemu-img:
avoid calling exit(1) to release resources properly") because the
variables are already initialized during declaration.

Reported-by: John Snow <jsnow@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2014-08-26 19:17:56 +01:00
parent cbda016d94
commit 40ed35a3c4
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qemu-img.c
View File

@ -2304,7 +2304,7 @@ static int img_snapshot(int argc, char **argv)
static int img_rebase(int argc, char **argv) static int img_rebase(int argc, char **argv)
{ {
BlockDriverState *bs, *bs_old_backing = NULL, *bs_new_backing = NULL; BlockDriverState *bs = NULL, *bs_old_backing = NULL, *bs_new_backing = NULL;
BlockDriver *old_backing_drv, *new_backing_drv; BlockDriver *old_backing_drv, *new_backing_drv;
char *filename; char *filename;
const char *fmt, *cache, *src_cache, *out_basefmt, *out_baseimg; const char *fmt, *cache, *src_cache, *out_basefmt, *out_baseimg;
@ -2376,14 +2376,14 @@ static int img_rebase(int argc, char **argv)
ret = bdrv_parse_cache_flags(cache, &flags); ret = bdrv_parse_cache_flags(cache, &flags);
if (ret < 0) { if (ret < 0) {
error_report("Invalid cache option: %s", cache); error_report("Invalid cache option: %s", cache);
return -1; goto out;
} }
src_flags = BDRV_O_FLAGS; src_flags = BDRV_O_FLAGS;
ret = bdrv_parse_cache_flags(src_cache, &src_flags); ret = bdrv_parse_cache_flags(src_cache, &src_flags);
if (ret < 0) { if (ret < 0) {
error_report("Invalid source cache option: %s", src_cache); error_report("Invalid source cache option: %s", src_cache);
return -1; goto out;
} }
/* /*
@ -2394,7 +2394,8 @@ static int img_rebase(int argc, char **argv)
*/ */
bs = bdrv_new_open("image", filename, fmt, flags, true, quiet); bs = bdrv_new_open("image", filename, fmt, flags, true, quiet);
if (!bs) { if (!bs) {
return 1; ret = -1;
goto out;
} }
/* Find the right drivers for the backing files */ /* Find the right drivers for the backing files */
@ -2420,11 +2421,7 @@ static int img_rebase(int argc, char **argv)
} }
/* For safe rebasing we need to compare old and new backing file */ /* For safe rebasing we need to compare old and new backing file */
if (unsafe) { if (!unsafe) {
/* Make the compiler happy */
bs_old_backing = NULL;
bs_new_backing = NULL;
} else {
char backing_name[1024]; char backing_name[1024];
bs_old_backing = bdrv_new("old_backing", &error_abort); bs_old_backing = bdrv_new("old_backing", &error_abort);