aboutsummaryrefslogtreecommitdiff
path: root/hw/pci.h
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-08-14 10:36:05 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-08-27 20:43:28 -0500
commit81a322d4a1b68d47908a6630bf22897a289722aa (patch)
treecdca9840d0620d9e0b46d7b81c58abe04a372b78 /hw/pci.h
parent24e6f3551f3c8ea7cc7524a3e64e84beca59618f (diff)
downloadqemu-81a322d4a1b68d47908a6630bf22897a289722aa.zip
qemu-81a322d4a1b68d47908a6630bf22897a289722aa.tar.gz
qemu-81a322d4a1b68d47908a6630bf22897a289722aa.tar.bz2
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/pci.h')
-rw-r--r--hw/pci.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/pci.h b/hw/pci.h
index 32e98d4..fd1d35c 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -315,7 +315,7 @@ pci_config_set_class(uint8_t *pci_config, uint16_t val)
pci_set_word(&pci_config[PCI_CLASS_DEVICE], val);
}
-typedef void (*pci_qdev_initfn)(PCIDevice *dev);
+typedef int (*pci_qdev_initfn)(PCIDevice *dev);
typedef struct {
DeviceInfo qdev;
pci_qdev_initfn init;