qdev: add return value to init() callbacks.
Sorry folks, but it has to be. One more of these invasive qdev patches.
We have a serious design bug in the qdev interface: device init
callbacks can't signal failure because the init() callback has no
return value. This patch fixes it.
We have already one case in-tree where this is needed:
Try -device virtio-blk-pci (without drive= specified) and watch qemu
segfault. This patch fixes it.
With usb+scsi being converted to qdev we'll get more devices where the
init callback can fail for various reasons.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
diff --git a/hw/eepro100.c b/hw/eepro100.c
index d9b2e5d..6c5e989 100644
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -1732,7 +1732,7 @@
return 0;
}
-static void nic_init(PCIDevice *pci_dev, uint32_t device)
+static int nic_init(PCIDevice *pci_dev, uint32_t device)
{
PCIEEPRO100State *d = (PCIEEPRO100State *)pci_dev;
EEPRO100State *s;
@@ -1778,21 +1778,22 @@
qemu_register_reset(nic_reset, s);
register_savevm(s->vc->model, -1, 3, nic_save, nic_load, s);
+ return 0;
}
-static void pci_i82551_init(PCIDevice *dev)
+static int pci_i82551_init(PCIDevice *dev)
{
- nic_init(dev, i82551);
+ return nic_init(dev, i82551);
}
-static void pci_i82557b_init(PCIDevice *dev)
+static int pci_i82557b_init(PCIDevice *dev)
{
- nic_init(dev, i82557B);
+ return nic_init(dev, i82557B);
}
-static void pci_i82559er_init(PCIDevice *dev)
+static int pci_i82559er_init(PCIDevice *dev)
{
- nic_init(dev, i82559ER);
+ return nic_init(dev, i82559ER);
}
static PCIDeviceInfo eepro100_info[] = {
