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/pl110.c | |
| parent | 24e6f3551f3c8ea7cc7524a3e64e84beca59618f (diff) | |
| download | qemu-81a322d4a1b68d47908a6630bf22897a289722aa.tar.gz | |
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/pl110.c')
| -rw-r--r-- | hw/pl110.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/pl110.c b/hw/pl110.c index 9b5724b1e9..173458a7cd 100644 --- a/hw/pl110.c +++ b/hw/pl110.c @@ -352,7 +352,7 @@ static CPUWriteMemoryFunc * const pl110_writefn[] = { pl110_write }; -static void pl110_init(SysBusDevice *dev) +static int pl110_init(SysBusDevice *dev) { pl110_state *s = FROM_SYSBUS(pl110_state, dev); int iomemtype; @@ -365,13 +365,14 @@ static void pl110_init(SysBusDevice *dev) pl110_invalidate_display, NULL, NULL, s); /* ??? Save/restore. */ + return 0; } -static void pl110_versatile_init(SysBusDevice *dev) +static int pl110_versatile_init(SysBusDevice *dev) { pl110_state *s = FROM_SYSBUS(pl110_state, dev); s->versatile = 1; - pl110_init(dev); + return pl110_init(dev); } static void pl110_register_devices(void) |