qemu-img: fix error reporting for -object
diff mbox series

Message ID 20190219114609.1582-1-berrange@redhat.com
State New
Headers show
Series
  • qemu-img: fix error reporting for -object
Related show

Commit Message

Daniel P. Berrangé Feb. 19, 2019, 11:46 a.m. UTC
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(-)

Comments

Philippe Mathieu-Daudé Feb. 19, 2019, 12:15 p.m. UTC | #1
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;
>      }
>  
>
Markus Armbruster Feb. 19, 2019, 1:10 p.m. UTC | #2
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>
Stefano Garzarella Feb. 19, 2019, 4:14 p.m. UTC | #3
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>
Kevin Wolf Feb. 20, 2019, 11:59 a.m. UTC | #4
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

Patch
diff mbox series

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;
     }