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/pl011.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/pl011.c')
| -rw-r--r-- | hw/pl011.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/hw/pl011.c b/hw/pl011.c index 08a55ace8b..81de91e4c4 100644 --- a/hw/pl011.c +++ b/hw/pl011.c @@ -286,7 +286,7 @@ static int pl011_load(QEMUFile *f, void *opaque, int version_id) return 0; } -static void pl011_init(SysBusDevice *dev, const unsigned char *id) +static int pl011_init(SysBusDevice *dev, const unsigned char *id) { int iomemtype; pl011_state *s = FROM_SYSBUS(pl011_state, dev); @@ -307,16 +307,17 @@ static void pl011_init(SysBusDevice *dev, const unsigned char *id) pl011_event, s); } register_savevm("pl011_uart", -1, 1, pl011_save, pl011_load, s); + return 0; } -static void pl011_init_arm(SysBusDevice *dev) +static int pl011_init_arm(SysBusDevice *dev) { - pl011_init(dev, pl011_id_arm); + return pl011_init(dev, pl011_id_arm); } -static void pl011_init_luminary(SysBusDevice *dev) +static int pl011_init_luminary(SysBusDevice *dev) { - pl011_init(dev, pl011_id_luminary); + return pl011_init(dev, pl011_id_luminary); } static void pl011_register_devices(void) |