Commit 22b80e85 authored by Gonglei's avatar Gonglei Committed by Michael S. Tsirkin
Browse files

pci-hotplug-old: avoid losing error message 



When scsi_bus_legacy_add_drive() produces an error,
we will lose the error message. Using error_report
to report it.

Cc: Markus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarGonglei <arei.gonglei@huawei.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 45363e46

hw/pci/pci-hotplug-old.c

+4 −1
Original line number Diff line number Diff line
@@ -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);

                                        false, -1, NULL, &local_err);

    if (!scsidev) {

        error_report("%s", error_get_pretty(local_err));

        error_free(local_err);

        return -1;

    }

    dinfo->unit = scsidev->id;