From 81a322d4a1b68d47908a6630bf22897a289722aa Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 14 Aug 2009 10:36:05 +0200 Subject: 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 Signed-off-by: Anthony Liguori --- hw/pci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/pci.h') 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; -- cgit v1.1