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/sun4u.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/sun4u.c')
| -rw-r--r-- | hw/sun4u.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/hw/sun4u.c b/hw/sun4u.c index 09027e2f91..df25d41fec 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -358,7 +358,7 @@ pci_ebus_init(PCIBus *bus, int devfn) pci_create_simple(bus, devfn, "ebus"); } -static void +static int pci_ebus_init1(PCIDevice *s) { isa_bus_new(&s->qdev); @@ -379,6 +379,7 @@ pci_ebus_init1(PCIDevice *s) ebus_mmio_mapfunc); pci_register_bar(s, 1, 0x800000, PCI_ADDRESS_SPACE_MEM, ebus_mmio_mapfunc); + return 0; } static PCIDeviceInfo ebus_info = { @@ -428,12 +429,13 @@ static void prom_init(target_phys_addr_t addr, const char *bios_name) } } -static void prom_init1(SysBusDevice *dev) +static int prom_init1(SysBusDevice *dev) { ram_addr_t prom_offset; prom_offset = qemu_ram_alloc(PROM_SIZE_MAX); sysbus_init_mmio(dev, PROM_SIZE_MAX, prom_offset | IO_MEM_ROM); + return 0; } static SysBusDeviceInfo prom_info = { @@ -460,7 +462,7 @@ typedef struct RamDevice } RamDevice; /* System RAM */ -static void ram_init1(SysBusDevice *dev) +static int ram_init1(SysBusDevice *dev) { ram_addr_t RAM_size, ram_offset; RamDevice *d = FROM_SYSBUS(RamDevice, dev); @@ -469,6 +471,7 @@ static void ram_init1(SysBusDevice *dev) ram_offset = qemu_ram_alloc(RAM_size); sysbus_init_mmio(dev, RAM_size, ram_offset); + return 0; } static void ram_init(target_phys_addr_t addr, ram_addr_t RAM_size) |