aboutsummaryrefslogtreecommitdiffstats
path: root/hw/armv7m.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/armv7m.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/armv7m.c')
-rw-r--r--hw/armv7m.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/armv7m.c b/hw/armv7m.c
index bf913315b..059a356e2 100644
--- a/hw/armv7m.c
+++ b/hw/armv7m.c
@@ -122,7 +122,7 @@ typedef struct {
uint32_t base;
} BitBandState;
-static void bitband_init(SysBusDevice *dev)
+static int bitband_init(SysBusDevice *dev)
{
BitBandState *s = FROM_SYSBUS(BitBandState, dev);
int iomemtype;
@@ -130,6 +130,7 @@ static void bitband_init(SysBusDevice *dev)
iomemtype = cpu_register_io_memory(bitband_readfn, bitband_writefn,
&s->base);
sysbus_init_mmio(dev, 0x02000000, iomemtype);
+ return 0;
}
static void armv7m_bitband_init(void)