[Qemu-devel] [PATCH] pci-hotplug-old: avoid lossing error message

[Qemu-devel] [PATCH] pci-hotplug-old: avoid lossing error message

[arei.gonglei]

From: Gonglei <arei.gonglei@huawei.com>

When scsi_bus_legacy_add_drive() produce error,
we will loss error message. Using error_report
report it.

Cc: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
---
 hw/pci/pci-hotplug-old.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/hw/pci/pci-hotplug-old.c b/hw/pci/pci-hotplug-old.c
index cf2caeb..ed85f24 100644
--- a/hw/pci/pci-hotplug-old.c
+++ b/hw/pci/pci-hotplug-old.c
@@ -107,6 +107,7 @@ static int scsi_hot_add(Monitor *mon, DeviceState *adapter,
 {
     SCSIBus *scsibus;
     SCSIDevice *scsidev;
+    Error *local_err = NULL;
 
     scsibus = (SCSIBus *)
         object_dynamic_cast(OBJECT(QLIST_FIRST(&adapter->child_bus)),
@@ -127,8 +128,10 @@ static int scsi_hot_add(Monitor *mon, DeviceState *adapter,
     dinfo->unit = qemu_opt_get_number(dinfo->opts, "unit", -1);
     dinfo->bus = scsibus->busnr;
     scsidev = scsi_bus_legacy_add_drive(scsibus, dinfo->bdrv, dinfo->unit,
-                                        false, -1, NULL, NULL);
-    if (!scsidev) {
+                                        false, -1, NULL, &local_err);
+    if (local_err) {
+        error_report("%s", error_get_pretty(local_err));
+        error_free(local_err);
         return -1;
     }
     dinfo->unit = scsidev->id;
-- 
1.7.12.4

Re: [Qemu-devel] [PATCH] pci-hotplug-old: avoid lossing error message

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 760 bytes --]

On 09/18/2014 02:53 AM, arei.gonglei@huawei.com wrote:
> From: Gonglei <arei.gonglei@huawei.com>

s/lossing/losing/ in the subject.

> 
> When scsi_bus_legacy_add_drive() produce error,

s/produce error/produces an error/

> we will loss error message. Using error_report

s/loss/lose the/
s/Using error_report/Use error_report to/

> report it.
> 
> Cc: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Gonglei <arei.gonglei@huawei.com>
> ---
>  hw/pci/pci-hotplug-old.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 

With the commit message improved,
Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 539 bytes --]

Re: [Qemu-devel] [PATCH] pci-hotplug-old: avoid lossing error message

[Gonglei (Arei)]

> -----Original Message-----
> From: Eric Blake [mailto:eblake@redhat.com]
> Sent: Thursday, September 18, 2014 8:22 PM
> To: Gonglei (Arei); qemu-devel@nongnu.org
> Cc: Huangweidong (C); armbru@redhat.com; mst@redhat.com
> Subject: Re: [Qemu-devel] [PATCH] pci-hotplug-old: avoid lossing error message
> 
> On 09/18/2014 02:53 AM, arei.gonglei@huawei.com wrote:
> > From: Gonglei <arei.gonglei@huawei.com>
> 
> s/lossing/losing/ in the subject.
> 
> >
> > When scsi_bus_legacy_add_drive() produce error,
> 
> s/produce error/produces an error/
> 
> > we will loss error message. Using error_report
> 
> s/loss/lose the/
> s/Using error_report/Use error_report to/
> 
> > report it.
> >
> > Cc: Markus Armbruster <armbru@redhat.com>
> > Signed-off-by: Gonglei <arei.gonglei@huawei.com>
> > ---
> >  hw/pci/pci-hotplug-old.c | 7 +++++--
> >  1 file changed, 5 insertions(+), 2 deletions(-)
> >
> 
> With the commit message improved,
> Reviewed-by: Eric Blake <eblake@redhat.com>
> 

Thanks, Eric.

I posted v2 and Markus have reviewed. 
If you haven't dissidence for v2, I will post v3 by your comments 
and add your both 'R-b' tag. :)

Best regards,
-Gonglei

> --
> Eric Blake   eblake redhat com    +1-919-301-3266
> Libvirt virtualization library http://libvirt.org