@@ -149,8 +149,8 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon,
default:
dev = NULL;
}
- if (dev)
- qdev_init(&dev->qdev);
+ if (!dev || qdev_init(&dev->qdev) < 0)
+ return NULL;
return dev;
}
@@ -807,6 +807,7 @@ static const char * const pci_nic_names[] = {
};
/* Initialize a PCI NIC. */
+/* FIXME callers should check for failure, but don't */
PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,
const char *default_devaddr)
{
@@ -824,7 +825,8 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,
if (nd->id)
dev->id = qemu_strdup(nd->id);
dev->nd = nd;
- qdev_init(dev);
+ if (qdev_init(dev) < 0)
+ return NULL;
nd->private = dev;
return pci_dev;
}
@@ -65,6 +65,7 @@ void scsi_qdev_register(SCSIDeviceInfo *info)
}
/* handle legacy '-drive if=scsi,...' cmd line args */
+/* FIXME callers should check for failure, but don't */
SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, DriveInfo *dinfo, int unit)
{
const char *driver;
@@ -74,7 +75,8 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, DriveInfo *dinfo, int unit)
dev = qdev_create(&bus->qbus, driver);
qdev_prop_set_uint32(dev, "scsi-id", unit);
qdev_prop_set_drive(dev, "drive", dinfo);
- qdev_init(dev);
+ if (qdev_init(dev) < 0)
+ return NULL;
return DO_UPCAST(SCSIDevice, qdev, dev);
}
@@ -579,7 +579,8 @@ USBDevice *usb_msd_init(const char *filename)
/* create guest device */
dev = usb_create(NULL /* FIXME */, "QEMU USB MSD");
qdev_prop_set_drive(&dev->qdev, "drive", dinfo);
- qdev_init(&dev->qdev);
+ if (qdev_init(&dev->qdev) < 0)
+ return NULL;
return dev;
}
But do so only where it may actually fail. Leave the rest for the next commit. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- hw/pci-hotplug.c | 4 ++-- hw/pci.c | 4 +++- hw/scsi-bus.c | 4 +++- hw/usb-msd.c | 3 ++- 4 files changed, 10 insertions(+), 5 deletions(-)