From: Max Reitz <mre...@redhat.com> Otherwise the qemu-img process will exit with EXIT_SUCCESS instead of EXIT_FAILURE.
Cc: qemu-stable <qemu-sta...@nongnu.org> Signed-off-by: Max Reitz <mre...@redhat.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4...@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 <mdr...@linux.vnet.ibm.com> --- qemu-img.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qemu-img.c b/qemu-img.c index b220cf7..9aa7823 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; } -- 2.7.4