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/pl061.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/pl061.c')
| -rw-r--r-- | hw/pl061.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/pl061.c b/hw/pl061.c index 2f31517903..7b1b636e9b 100644 --- a/hw/pl061.c +++ b/hw/pl061.c @@ -291,7 +291,7 @@ static int pl061_load(QEMUFile *f, void *opaque, int version_id) return 0; } -static void pl061_init(SysBusDevice *dev) +static int pl061_init(SysBusDevice *dev) { int iomemtype; pl061_state *s = FROM_SYSBUS(pl061_state, dev); @@ -304,6 +304,7 @@ static void pl061_init(SysBusDevice *dev) qdev_init_gpio_out(&dev->qdev, s->out, 8); pl061_reset(s); register_savevm("pl061_gpio", -1, 1, pl061_save, pl061_load, s); + return 0; } static void pl061_register_devices(void) |