diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-07-21 12:16:34 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-07-23 00:37:35 +0200 |
| commit | caad4eb345dc5119d326b8af08452cc0f90f8548 (patch) | |
| tree | 3f253049cf4d7807579c5a158f801e65fb6e245b /hw/scsi/spapr_vscsi.c | |
| parent | 22d6aa03fd87ba5f219d26bc1810646d0f95842a (diff) | |
| download | qemu-caad4eb345dc5119d326b8af08452cc0f90f8548.tar.gz qemu-caad4eb345dc5119d326b8af08452cc0f90f8548.tar.bz2 qemu-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/spapr_vscsi.c')
| -rw-r--r-- | hw/scsi/spapr_vscsi.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c index e8978bfef1..55b44b9910 100644 --- a/hw/scsi/spapr_vscsi.c +++ b/hw/scsi/spapr_vscsi.c @@ -912,12 +912,17 @@ static void spapr_vscsi_reset(VIOsPAPRDevice *dev) static int spapr_vscsi_init(VIOsPAPRDevice *dev) { VSCSIState *s = VIO_SPAPR_VSCSI_DEVICE(dev); + Error *err = NULL; dev->crq.SendFunc = vscsi_do_crq; scsi_bus_new(&s->bus, &dev->qdev, &vscsi_scsi_info, NULL); if (!dev->qdev.hotplugged) { - 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; |