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/xilinx_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/xilinx_timer.c')
| -rw-r--r-- | hw/xilinx_timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c index 0c208898c6..e2d9541cda 100644 --- a/hw/xilinx_timer.c +++ b/hw/xilinx_timer.c @@ -189,7 +189,7 @@ static void timer_hit(void *opaque) timer_update_irq(t); } -static void xilinx_timer_init(SysBusDevice *dev) +static int xilinx_timer_init(SysBusDevice *dev) { struct timerblock *t = FROM_SYSBUS(typeof (*t), dev); unsigned int i; @@ -212,6 +212,7 @@ static void xilinx_timer_init(SysBusDevice *dev) timer_regs = cpu_register_io_memory(timer_read, timer_write, t); sysbus_init_mmio(dev, R_MAX * 4 * t->nr_timers, timer_regs); + return 0; } static SysBusDeviceInfo xilinx_timer_info = { |