From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:37218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gw3qu-000362-LA for qemu-devel@nongnu.org; Tue, 19 Feb 2019 06:46:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gw3qs-0003Op-Lc for qemu-devel@nongnu.org; Tue, 19 Feb 2019 06:46:20 -0500 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 19 Feb 2019 11:46:09 +0000 Message-Id: <20190219114609.1582-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] qemu-img: fix error reporting for -object List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Max Reitz , qemu-block@nongnu.org, Markus Armbruster , qemu-stable@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Error reporting for user_creatable_add_opts_foreach was changed so that it no longer called 'error_report_err' in: commit 7e1e0c11127bde81cff260fc6859690435c509d6 Author: Markus Armbruster Date: Wed Oct 17 10:26:43 2018 +0200 qom: Clean up error reporting in user_creatable_add_opts_foreach() Some callers were updated to pass in "&error_fatal" but all the ones in qemu-img were left passing NULL. As a result all errors went to /dev/null instead of being reported to the user. Signed-off-by: Daniel P. Berrang=C3=A9 --- qemu-img.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 25288c4d18..903c37b706 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -503,7 +503,7 @@ static int img_create(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, &error_fatal)) { goto fail; } =20 @@ -753,7 +753,7 @@ static int img_check(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, &error_fatal)) { return 1; } =20 @@ -966,7 +966,7 @@ static int img_commit(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, &error_fatal)) { return 1; } =20 @@ -1349,7 +1349,7 @@ static int img_compare(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, &error_fatal)) { ret =3D 2; goto out4; } @@ -2159,7 +2159,7 @@ static int img_convert(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, &error_fatal)) { goto fail_getopt; } =20 @@ -2713,7 +2713,7 @@ static int img_info(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, &error_fatal)) { return 1; } =20 @@ -2932,7 +2932,7 @@ static int img_map(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, &error_fatal)) { return 1; } =20 @@ -3081,7 +3081,7 @@ static int img_snapshot(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, &error_fatal)) { return 1; } =20 @@ -3241,7 +3241,7 @@ static int img_rebase(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, &error_fatal)) { return 1; } =20 @@ -3621,7 +3621,7 @@ static int img_resize(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, &error_fatal)) { return 1; } =20 @@ -3865,7 +3865,7 @@ static int img_amend(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, &error_fatal)) { ret =3D -1; goto out_no_progress; } @@ -4509,7 +4509,7 @@ static int img_dd(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, &error_fatal)) { ret =3D -1; goto out; } @@ -4786,7 +4786,7 @@ static int img_measure(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, &error_fatal)) { goto out; } =20 --=20 2.20.1