aboutsummaryrefslogtreecommitdiff
path: root/hw/pl031.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-08-14 10:36:05 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-08-27 20:43:28 -0500
commit81a322d4a1b68d47908a6630bf22897a289722aa (patch)
treecdca9840d0620d9e0b46d7b81c58abe04a372b78 /hw/pl031.c
parent24e6f3551f3c8ea7cc7524a3e64e84beca59618f (diff)
downloadqemu-81a322d4a1b68d47908a6630bf22897a289722aa.zip
qemu-81a322d4a1b68d47908a6630bf22897a289722aa.tar.gz
qemu-81a322d4a1b68d47908a6630bf22897a289722aa.tar.bz2
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/pl031.c')
-rw-r--r--hw/pl031.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/pl031.c b/hw/pl031.c
index 671491f..19577dd 100644
--- a/hw/pl031.c
+++ b/hw/pl031.c
@@ -183,7 +183,7 @@ static CPUReadMemoryFunc * const pl031_readfn[] = {
pl031_read
};
-static void pl031_init(SysBusDevice *dev)
+static int pl031_init(SysBusDevice *dev)
{
int iomemtype;
pl031_state *s = FROM_SYSBUS(pl031_state, dev);
@@ -202,6 +202,7 @@ static void pl031_init(SysBusDevice *dev)
s->tick_offset = mktimegm(&tm);
s->timer = qemu_new_timer(vm_clock, pl031_interrupt, s);
+ return 0;
}
static void pl031_register_devices(void)