summaryrefslogtreecommitdiff
path: root/hw/pl181.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/pl181.c
parent24e6f3551f3c8ea7cc7524a3e64e84beca59618f (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/pl181.c')
-rw-r--r--hw/pl181.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/pl181.c b/hw/pl181.c
index 955e5ec3c3..7282053053 100644
--- a/hw/pl181.c
+++ b/hw/pl181.c
@@ -445,7 +445,7 @@ static void pl181_reset(void *opaque)
s->mask[1] = 0;
}
-static void pl181_init(SysBusDevice *dev)
+static int pl181_init(SysBusDevice *dev)
{
int iomemtype;
pl181_state *s = FROM_SYSBUS(pl181_state, dev);
@@ -461,6 +461,7 @@ static void pl181_init(SysBusDevice *dev)
qemu_register_reset(pl181_reset, s);
pl181_reset(s);
/* ??? Save/restore. */
+ return 0;
}
static void pl181_register_devices(void)