diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-08-14 10:36:05 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-08-27 20:43:28 -0500 |
| commit | 81a322d4a1b68d47908a6630bf22897a289722aa (patch) | |
| tree | cdca9840d0620d9e0b46d7b81c58abe04a372b78 /hw/e1000.c | |
| parent | 24e6f3551f3c8ea7cc7524a3e64e84beca59618f (diff) | |
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>
Diffstat (limited to 'hw/e1000.c')
| -rw-r--r-- | hw/e1000.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/e1000.c b/hw/e1000.c index d95a6c89de..0253d3b356 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -1081,7 +1081,7 @@ static void e1000_reset(void *opaque) memset(&d->tx, 0, sizeof d->tx); } -static void pci_e1000_init(PCIDevice *pci_dev) +static int pci_e1000_init(PCIDevice *pci_dev) { E1000State *d = (E1000State *)pci_dev; uint8_t *pci_conf; @@ -1132,6 +1132,7 @@ static void pci_e1000_init(PCIDevice *pci_dev) d->dev.unregister = pci_e1000_uninit; qemu_register_reset(e1000_reset, d); e1000_reset(d); + return 0; } static PCIDeviceInfo e1000_info = { |