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/cirrus_vga.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'hw/cirrus_vga.c') diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 64ff5241d8..6e9cbd412d 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -3302,7 +3302,7 @@ static void pci_cirrus_write_config(PCIDevice *d, cirrus_update_memory_access(s); } -static void pci_cirrus_vga_initfn(PCIDevice *dev) +static int pci_cirrus_vga_initfn(PCIDevice *dev) { PCICirrusVGAState *d = DO_UPCAST(PCICirrusVGAState, dev, dev); CirrusVGAState *s = &d->cirrus_vga; @@ -3335,6 +3335,7 @@ static void pci_cirrus_vga_initfn(PCIDevice *dev) PCI_ADDRESS_SPACE_MEM, cirrus_pci_mmio_map); } /* XXX: ROM BIOS */ + return 0; } void pci_cirrus_vga_init(PCIBus *bus) -- cgit v1.2.1