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/slavio_misc.c | |
| parent | 24e6f3551f3c8ea7cc7524a3e64e84beca59618f (diff) | |
| download | focaccia-qemu-81a322d4a1b68d47908a6630bf22897a289722aa.tar.gz focaccia-qemu-81a322d4a1b68d47908a6630bf22897a289722aa.zip | |
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/slavio_misc.c')
| -rw-r--r-- | hw/slavio_misc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/slavio_misc.c b/hw/slavio_misc.c index 4c9337cc51..a25d6781db 100644 --- a/hw/slavio_misc.c +++ b/hw/slavio_misc.c @@ -434,7 +434,7 @@ static int slavio_misc_load(QEMUFile *f, void *opaque, int version_id) return 0; } -static void apc_init1(SysBusDevice *dev) +static int apc_init1(SysBusDevice *dev) { APCState *s = FROM_SYSBUS(APCState, dev); int io; @@ -444,9 +444,10 @@ static void apc_init1(SysBusDevice *dev) /* Power management (APC) XXX: not a Slavio device */ io = cpu_register_io_memory(apc_mem_read, apc_mem_write, s); sysbus_init_mmio(dev, MISC_SIZE, io); + return 0; } -static void slavio_misc_init1(SysBusDevice *dev) +static int slavio_misc_init1(SysBusDevice *dev) { MiscState *s = FROM_SYSBUS(MiscState, dev); int io; @@ -498,6 +499,7 @@ static void slavio_misc_init1(SysBusDevice *dev) s); qemu_register_reset(slavio_misc_reset, s); slavio_misc_reset(s); + return 0; } static SysBusDeviceInfo slavio_misc_info = { |