diff mbox

qemu-img: Avoid qerror_report_err() outside QMP handlers, again

Message ID 1426172882-20084-1-git-send-email-armbru@redhat.com
State New
Headers show

Commit Message

Markus Armbruster March 12, 2015, 3:08 p.m. UTC 
qerror_report_err() is a transitional interface to help with
converting existing monitor commands to QMP.  It should not be used
elsewhere.  Replace by error_report_err().

Commit 6936f29 cleaned that up in qemu-img.c, but two calls have crept
in since.  Take care of them the same way.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 qemu-img.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Eric Blake March 12, 2015, 4:43 p.m. UTC | #1 
On 03/12/2015 09:08 AM, Markus Armbruster wrote:
> qerror_report_err() is a transitional interface to help with
> converting existing monitor commands to QMP.  It should not be used
> elsewhere.  Replace by error_report_err().
> 
> Commit 6936f29 cleaned that up in qemu-img.c, but two calls have crept
> in since.  Take care of them the same way.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  qemu-img.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)

Reviewed-by: Eric Blake <eblake@redhat.com>
Kevin Wolf March 16, 2015, 3:07 p.m. UTC | #2 
Am 12.03.2015 um 16:08 hat Markus Armbruster geschrieben:
> qerror_report_err() is a transitional interface to help with
> converting existing monitor commands to QMP.  It should not be used
> elsewhere.  Replace by error_report_err().
> 
> Commit 6936f29 cleaned that up in qemu-img.c, but two calls have crept
> in since.  Take care of them the same way.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Thanks, applied to the block branch.

Kevin
diff mbox

Patch

diff --git a/qemu-img.c b/qemu-img.c
index 5af6f45..c797d19 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -274,8 +274,7 @@  static int print_block_option_help(const char *filename, const char *fmt)
     if (filename) {
         proto_drv = bdrv_find_protocol(filename, true, &local_err);
         if (!proto_drv) {
-            qerror_report_err(local_err);
-            error_free(local_err);
+            error_report_err(local_err);
             qemu_opts_free(create_opts);
             return 1;
         }
@@ -1526,8 +1525,7 @@  static int img_convert(int argc, char **argv)
 
     proto_drv = bdrv_find_protocol(out_filename, true, &local_err);
     if (!proto_drv) {
-        qerror_report_err(local_err);
-        error_free(local_err);
+        error_report_err(local_err);
         ret = -1;
         goto out;
     }