* [Qemu-devel] [PATCH] qemu-img: fix error reporting for -object
@ 2019-02-19 11:46 Daniel P. Berrangé
2019-02-19 12:15 ` Philippe Mathieu-Daudé
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Daniel P. Berrangé @ 2019-02-19 11:46 UTC (permalink / raw)
To: qemu-devel
Cc: Kevin Wolf, Max Reitz, qemu-block, Markus Armbruster,
qemu-stable, Daniel P. Berrangé
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 <armbru@redhat.com>
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é <berrange@redhat.com>
---
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)
if (qemu_opts_foreach(&qemu_object_opts,
user_creatable_add_opts_foreach,
- NULL, NULL)) {
+ NULL, &error_fatal)) {
goto fail;
}
@@ -753,7 +753,7 @@ static int img_check(int argc, char **argv)
if (qemu_opts_foreach(&qemu_object_opts,
user_creatable_add_opts_foreach,
- NULL, NULL)) {
+ NULL, &error_fatal)) {
return 1;
}
@@ -966,7 +966,7 @@ static int img_commit(int argc, char **argv)
if (qemu_opts_foreach(&qemu_object_opts,
user_creatable_add_opts_foreach,
- NULL, NULL)) {
+ NULL, &error_fatal)) {
return 1;
}
@@ -1349,7 +1349,7 @@ static int img_compare(int argc, char **argv)
if (qemu_opts_foreach(&qemu_object_opts,
user_creatable_add_opts_foreach,
- NULL, NULL)) {
+ NULL, &error_fatal)) {
ret = 2;
goto out4;
}
@@ -2159,7 +2159,7 @@ static int img_convert(int argc, char **argv)
if (qemu_opts_foreach(&qemu_object_opts,
user_creatable_add_opts_foreach,
- NULL, NULL)) {
+ NULL, &error_fatal)) {
goto fail_getopt;
}
@@ -2713,7 +2713,7 @@ static int img_info(int argc, char **argv)
if (qemu_opts_foreach(&qemu_object_opts,
user_creatable_add_opts_foreach,
- NULL, NULL)) {
+ NULL, &error_fatal)) {
return 1;
}
@@ -2932,7 +2932,7 @@ static int img_map(int argc, char **argv)
if (qemu_opts_foreach(&qemu_object_opts,
user_creatable_add_opts_foreach,
- NULL, NULL)) {
+ NULL, &error_fatal)) {
return 1;
}
@@ -3081,7 +3081,7 @@ static int img_snapshot(int argc, char **argv)
if (qemu_opts_foreach(&qemu_object_opts,
user_creatable_add_opts_foreach,
- NULL, NULL)) {
+ NULL, &error_fatal)) {
return 1;
}
@@ -3241,7 +3241,7 @@ static int img_rebase(int argc, char **argv)
if (qemu_opts_foreach(&qemu_object_opts,
user_creatable_add_opts_foreach,
- NULL, NULL)) {
+ NULL, &error_fatal)) {
return 1;
}
@@ -3621,7 +3621,7 @@ static int img_resize(int argc, char **argv)
if (qemu_opts_foreach(&qemu_object_opts,
user_creatable_add_opts_foreach,
- NULL, NULL)) {
+ NULL, &error_fatal)) {
return 1;
}
@@ -3865,7 +3865,7 @@ static int img_amend(int argc, char **argv)
if (qemu_opts_foreach(&qemu_object_opts,
user_creatable_add_opts_foreach,
- NULL, NULL)) {
+ NULL, &error_fatal)) {
ret = -1;
goto out_no_progress;
}
@@ -4509,7 +4509,7 @@ static int img_dd(int argc, char **argv)
if (qemu_opts_foreach(&qemu_object_opts,
user_creatable_add_opts_foreach,
- NULL, NULL)) {
+ NULL, &error_fatal)) {
ret = -1;
goto out;
}
@@ -4786,7 +4786,7 @@ static int img_measure(int argc, char **argv)
if (qemu_opts_foreach(&qemu_object_opts,
user_creatable_add_opts_foreach,
- NULL, NULL)) {
+ NULL, &error_fatal)) {
goto out;
}
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] qemu-img: fix error reporting for -object
2019-02-19 11:46 [Qemu-devel] [PATCH] qemu-img: fix error reporting for -object Daniel P. Berrangé
@ 2019-02-19 12:15 ` Philippe Mathieu-Daudé
2019-02-19 13:10 ` Markus Armbruster
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-02-19 12:15 UTC (permalink / raw)
To: Daniel P. Berrangé, qemu-devel
Cc: Kevin Wolf, qemu-block, qemu-stable, Markus Armbruster, Max Reitz
On 2/19/19 12:46 PM, Daniel P. Berrangé wrote:
> 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 <armbru@redhat.com>
> 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é <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> 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)
>
> if (qemu_opts_foreach(&qemu_object_opts,
> user_creatable_add_opts_foreach,
> - NULL, NULL)) {
> + NULL, &error_fatal)) {
> goto fail;
> }
>
> @@ -753,7 +753,7 @@ static int img_check(int argc, char **argv)
>
> if (qemu_opts_foreach(&qemu_object_opts,
> user_creatable_add_opts_foreach,
> - NULL, NULL)) {
> + NULL, &error_fatal)) {
> return 1;
> }
>
> @@ -966,7 +966,7 @@ static int img_commit(int argc, char **argv)
>
> if (qemu_opts_foreach(&qemu_object_opts,
> user_creatable_add_opts_foreach,
> - NULL, NULL)) {
> + NULL, &error_fatal)) {
> return 1;
> }
>
> @@ -1349,7 +1349,7 @@ static int img_compare(int argc, char **argv)
>
> if (qemu_opts_foreach(&qemu_object_opts,
> user_creatable_add_opts_foreach,
> - NULL, NULL)) {
> + NULL, &error_fatal)) {
> ret = 2;
> goto out4;
> }
> @@ -2159,7 +2159,7 @@ static int img_convert(int argc, char **argv)
>
> if (qemu_opts_foreach(&qemu_object_opts,
> user_creatable_add_opts_foreach,
> - NULL, NULL)) {
> + NULL, &error_fatal)) {
> goto fail_getopt;
> }
>
> @@ -2713,7 +2713,7 @@ static int img_info(int argc, char **argv)
>
> if (qemu_opts_foreach(&qemu_object_opts,
> user_creatable_add_opts_foreach,
> - NULL, NULL)) {
> + NULL, &error_fatal)) {
> return 1;
> }
>
> @@ -2932,7 +2932,7 @@ static int img_map(int argc, char **argv)
>
> if (qemu_opts_foreach(&qemu_object_opts,
> user_creatable_add_opts_foreach,
> - NULL, NULL)) {
> + NULL, &error_fatal)) {
> return 1;
> }
>
> @@ -3081,7 +3081,7 @@ static int img_snapshot(int argc, char **argv)
>
> if (qemu_opts_foreach(&qemu_object_opts,
> user_creatable_add_opts_foreach,
> - NULL, NULL)) {
> + NULL, &error_fatal)) {
> return 1;
> }
>
> @@ -3241,7 +3241,7 @@ static int img_rebase(int argc, char **argv)
>
> if (qemu_opts_foreach(&qemu_object_opts,
> user_creatable_add_opts_foreach,
> - NULL, NULL)) {
> + NULL, &error_fatal)) {
> return 1;
> }
>
> @@ -3621,7 +3621,7 @@ static int img_resize(int argc, char **argv)
>
> if (qemu_opts_foreach(&qemu_object_opts,
> user_creatable_add_opts_foreach,
> - NULL, NULL)) {
> + NULL, &error_fatal)) {
> return 1;
> }
>
> @@ -3865,7 +3865,7 @@ static int img_amend(int argc, char **argv)
>
> if (qemu_opts_foreach(&qemu_object_opts,
> user_creatable_add_opts_foreach,
> - NULL, NULL)) {
> + NULL, &error_fatal)) {
> ret = -1;
> goto out_no_progress;
> }
> @@ -4509,7 +4509,7 @@ static int img_dd(int argc, char **argv)
>
> if (qemu_opts_foreach(&qemu_object_opts,
> user_creatable_add_opts_foreach,
> - NULL, NULL)) {
> + NULL, &error_fatal)) {
> ret = -1;
> goto out;
> }
> @@ -4786,7 +4786,7 @@ static int img_measure(int argc, char **argv)
>
> if (qemu_opts_foreach(&qemu_object_opts,
> user_creatable_add_opts_foreach,
> - NULL, NULL)) {
> + NULL, &error_fatal)) {
> goto out;
> }
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] qemu-img: fix error reporting for -object
2019-02-19 11:46 [Qemu-devel] [PATCH] qemu-img: fix error reporting for -object Daniel P. Berrangé
2019-02-19 12:15 ` Philippe Mathieu-Daudé
@ 2019-02-19 13:10 ` Markus Armbruster
2019-02-19 16:14 ` Stefano Garzarella
2019-02-20 11:59 ` Kevin Wolf
3 siblings, 0 replies; 5+ messages in thread
From: Markus Armbruster @ 2019-02-19 13:10 UTC (permalink / raw)
To: Daniel P. Berrangé
Cc: qemu-devel, Kevin Wolf, qemu-block, qemu-stable, Max Reitz
Daniel P. Berrangé <berrange@redhat.com> writes:
> 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 <armbru@redhat.com>
> 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é <berrange@redhat.com>
Mea culpa, I have no idea how this happened.
Reviewed-by: Markus Armbruster <armbru@redhat.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] qemu-img: fix error reporting for -object
2019-02-19 11:46 [Qemu-devel] [PATCH] qemu-img: fix error reporting for -object Daniel P. Berrangé
2019-02-19 12:15 ` Philippe Mathieu-Daudé
2019-02-19 13:10 ` Markus Armbruster
@ 2019-02-19 16:14 ` Stefano Garzarella
2019-02-20 11:59 ` Kevin Wolf
3 siblings, 0 replies; 5+ messages in thread
From: Stefano Garzarella @ 2019-02-19 16:14 UTC (permalink / raw)
To: Daniel P. Berrangé
Cc: qemu-devel, Kevin Wolf, qemu-block, qemu-stable,
Markus Armbruster, Max Reitz
On Tue, Feb 19, 2019 at 11:46:09AM +0000, Daniel P. Berrangé wrote:
> 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 <armbru@redhat.com>
> 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é <berrange@redhat.com>
> ---
> qemu-img.c | 26 +++++++++++++-------------
> 1 file changed, 13 insertions(+), 13 deletions(-)
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] qemu-img: fix error reporting for -object
2019-02-19 11:46 [Qemu-devel] [PATCH] qemu-img: fix error reporting for -object Daniel P. Berrangé
` (2 preceding siblings ...)
2019-02-19 16:14 ` Stefano Garzarella
@ 2019-02-20 11:59 ` Kevin Wolf
3 siblings, 0 replies; 5+ messages in thread
From: Kevin Wolf @ 2019-02-20 11:59 UTC (permalink / raw)
To: Daniel P. Berrangé
Cc: qemu-devel, Max Reitz, qemu-block, Markus Armbruster, qemu-stable
Am 19.02.2019 um 12:46 hat Daniel P. Berrangé geschrieben:
> 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 <armbru@redhat.com>
> 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é <berrange@redhat.com>
Thanks, applied to the block branch.
Kevin
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-02-20 12:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-19 11:46 [Qemu-devel] [PATCH] qemu-img: fix error reporting for -object Daniel P. Berrangé
2019-02-19 12:15 ` Philippe Mathieu-Daudé
2019-02-19 13:10 ` Markus Armbruster
2019-02-19 16:14 ` Stefano Garzarella
2019-02-20 11:59 ` Kevin Wolf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.