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/arm_timer.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/arm_timer.c')
| -rw-r--r-- | hw/arm_timer.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/arm_timer.c b/hw/arm_timer.c index 25cbf664a8..9fef191cbc 100644 --- a/hw/arm_timer.c +++ b/hw/arm_timer.c @@ -254,7 +254,7 @@ static int sp804_load(QEMUFile *f, void *opaque, int version_id) return 0; } -static void sp804_init(SysBusDevice *dev) +static int sp804_init(SysBusDevice *dev) { int iomemtype; sp804_state *s = FROM_SYSBUS(sp804_state, dev); @@ -272,6 +272,7 @@ static void sp804_init(SysBusDevice *dev) sp804_writefn, s); sysbus_init_mmio(dev, 0x1000, iomemtype); register_savevm("sp804", -1, 1, sp804_save, sp804_load, s); + return 0; } @@ -323,7 +324,7 @@ static CPUWriteMemoryFunc * const icp_pit_writefn[] = { icp_pit_write }; -static void icp_pit_init(SysBusDevice *dev) +static int icp_pit_init(SysBusDevice *dev) { int iomemtype; icp_pit_state *s = FROM_SYSBUS(icp_pit_state, dev); @@ -343,6 +344,7 @@ static void icp_pit_init(SysBusDevice *dev) sysbus_init_mmio(dev, 0x1000, iomemtype); /* This device has no state to save/restore. The component timers will save themselves. */ + return 0; } static void arm_timer_register_devices(void) |