diff options
| author | Max Reitz <mreitz@redhat.com> | 2017-04-13 22:33:59 +0200 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2017-07-31 15:55:25 -0500 |
| commit | c37a62b751647927ec8d09fd885cf4f36f81255c (patch) | |
| tree | 0685fd43cb9caca72e76ce3d4b15fc79965bfefa | |
| parent | 4aa16db9cf4219c0bb4fa0291349eb5d26c34a06 (diff) | |
qemu-img/convert: Always set ret < 0 on error
Otherwise the qemu-img process will exit with EXIT_SUCCESS instead of
EXIT_FAILURE.
Cc: qemu-stable <qemu-stable@nongnu.org>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
* applied directly to stable, upstream code has issue fixed via a
refactoring introduced by 9fd77f9, which isn't targetted for stable
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | qemu-img.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qemu-img.c b/qemu-img.c index b220cf71d7..9aa7823b5e 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -2069,6 +2069,7 @@ static int img_convert(int argc, char **argv) opts = qemu_opts_parse_noisily(&qemu_object_opts, optarg, true); if (!opts) { + ret = -1; goto fail_getopt; } break; @@ -2081,6 +2082,7 @@ static int img_convert(int argc, char **argv) if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, NULL, NULL)) { + ret = -1; goto fail_getopt; } |