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/m48t59.c | |
| parent | 24e6f3551f3c8ea7cc7524a3e64e84beca59618f (diff) | |
| download | hqemu-81a322d4a1b68d47908a6630bf22897a289722aa.zip hqemu-81a322d4a1b68d47908a6630bf22897a289722aa.tar.gz | |
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/m48t59.c')
| -rw-r--r-- | hw/m48t59.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/m48t59.c b/hw/m48t59.c index 3f2e3e5..0fcf4f8 100644 --- a/hw/m48t59.c +++ b/hw/m48t59.c @@ -642,7 +642,7 @@ m48t59_t *m48t59_init (qemu_irq IRQ, target_phys_addr_t mem_base, return d; } -static void m48t59_init1(SysBusDevice *dev) +static int m48t59_init1(SysBusDevice *dev) { m48t59_t *s = FROM_SYSBUS(m48t59_t, dev); int mem_index; @@ -661,6 +661,7 @@ static void m48t59_init1(SysBusDevice *dev) qemu_register_reset(m48t59_reset, s); register_savevm("m48t59", -1, 1, m48t59_save, m48t59_load, s); + return 0; } static SysBusDeviceInfo m48t59_info = { |
