summaryrefslogtreecommitdiff
path: root/hw/scsi/esp-pci.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-07-21 12:16:34 +0200
committerAndreas Färber <afaerber@suse.de>2013-07-23 00:37:35 +0200
commitcaad4eb345dc5119d326b8af08452cc0f90f8548 (patch)
tree3f253049cf4d7807579c5a158f801e65fb6e245b /hw/scsi/esp-pci.c
parent22d6aa03fd87ba5f219d26bc1810646d0f95842a (diff)
downloadqemu-caad4eb345dc5119d326b8af08452cc0f90f8548.zip
scsi: Improve error propagation for scsi_bus_legacy_handle_cmdline()
Let scsi_bus_legacy_add_drive() and scsi_bus_legacy_handle_cmdline() return an Error**. Prepare qdev initfns for QOM realize error model. Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/scsi/esp-pci.c')
-rw-r--r--hw/scsi/esp-pci.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c
index 6cdfd5338e..2ac21d4487 100644
--- a/hw/scsi/esp-pci.c
+++ b/hw/scsi/esp-pci.c
@@ -346,6 +346,7 @@ static int esp_pci_scsi_init(PCIDevice *dev)
DeviceState *d = DEVICE(dev);
ESPState *s = &pci->esp;
uint8_t *pci_conf;
+ Error *err = NULL;
pci_conf = dev->config;
@@ -364,7 +365,11 @@ static int esp_pci_scsi_init(PCIDevice *dev)
scsi_bus_new(&s->bus, d, &esp_pci_scsi_info, NULL);
if (!d->hotplugged) {
- return scsi_bus_legacy_handle_cmdline(&s->bus);
+ scsi_bus_legacy_handle_cmdline(&s->bus, &err);
+ if (err != NULL) {
+ error_free(err);
+ return -1;
+ }
}
return 0;
}