提交 22b80e85 编写于 作者: G Gonglei 提交者: Michael S. Tsirkin

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: NGonglei <arei.gonglei@huawei.com>
Reviewed-by: NMarkus Armbruster <armbru@redhat.com>
Reviewed-by: NEric Blake <eblake@redhat.com>
Acked-by: NMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
上级 45363e46
...@@ -107,6 +107,7 @@ static int scsi_hot_add(Monitor *mon, DeviceState *adapter, ...@@ -107,6 +107,7 @@ static int scsi_hot_add(Monitor *mon, DeviceState *adapter,
{ {
SCSIBus *scsibus; SCSIBus *scsibus;
SCSIDevice *scsidev; SCSIDevice *scsidev;
Error *local_err = NULL;
scsibus = (SCSIBus *) scsibus = (SCSIBus *)
object_dynamic_cast(OBJECT(QLIST_FIRST(&adapter->child_bus)), object_dynamic_cast(OBJECT(QLIST_FIRST(&adapter->child_bus)),
...@@ -127,8 +128,10 @@ static int scsi_hot_add(Monitor *mon, DeviceState *adapter, ...@@ -127,8 +128,10 @@ static int scsi_hot_add(Monitor *mon, DeviceState *adapter,
dinfo->unit = qemu_opt_get_number(dinfo->opts, "unit", -1); dinfo->unit = qemu_opt_get_number(dinfo->opts, "unit", -1);
dinfo->bus = scsibus->busnr; dinfo->bus = scsibus->busnr;
scsidev = scsi_bus_legacy_add_drive(scsibus, dinfo->bdrv, dinfo->unit, scsidev = scsi_bus_legacy_add_drive(scsibus, dinfo->bdrv, dinfo->unit,
false, -1, NULL, NULL); false, -1, NULL, &local_err);
if (!scsidev) { if (!scsidev) {
error_report("%s", error_get_pretty(local_err));
error_free(local_err);
return -1; return -1;
} }
dinfo->unit = scsidev->id; dinfo->unit = scsidev->id;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册