From: Markus Armbruster <armbru@redhat.com>
Date: Thu, 12 Mar 2015 16:26:50 +0000 (+0100)
Subject: usb/dev-storage: Avoid qerror_report_err() outside QMP handlers
X-Git-Tag: v2.3.0-rc1~6^2~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c326529b74aa37adb216604bb6ca93cd49007012;p=users%2Fdwmw2%2Fqemu.git

usb/dev-storage: Avoid qerror_report_err() outside QMP handlers

qerror_report_err() is a transitional interface to help with
converting existing monitor commands to QMP.  It should not be used
elsewhere.

usb_msd_password_cb() is only called from within an HMP command
handler.  Replace by error_report_err().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index f50bcb83e2..ae8d40dc77 100644
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -559,8 +559,7 @@ static void usb_msd_password_cb(void *opaque, int err)
     }
 
     if (local_err) {
-        qerror_report_err(local_err);
-        error_free(local_err);
+        error_report_err(local_err);
         qdev_unplug(&s->dev.qdev, NULL);
     }
 }