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/pl050.c | |
| parent | 24e6f3551f3c8ea7cc7524a3e64e84beca59618f (diff) | |
| download | qemu-81a322d4a1b68d47908a6630bf22897a289722aa.tar.gz qemu-81a322d4a1b68d47908a6630bf22897a289722aa.tar.bz2 qemu-81a322d4a1b68d47908a6630bf22897a289722aa.zip | |
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/pl050.c')
| -rw-r--r-- | hw/pl050.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/hw/pl050.c b/hw/pl050.c index 011edf25d6..a47786cb0a 100644 --- a/hw/pl050.c +++ b/hw/pl050.c @@ -122,7 +122,7 @@ static CPUWriteMemoryFunc * const pl050_writefn[] = { pl050_write }; -static void pl050_init(SysBusDevice *dev, int is_mouse) +static int pl050_init(SysBusDevice *dev, int is_mouse) { pl050_state *s = FROM_SYSBUS(pl050_state, dev); int iomemtype; @@ -137,16 +137,17 @@ static void pl050_init(SysBusDevice *dev, int is_mouse) else s->dev = ps2_kbd_init(pl050_update, s); /* ??? Save/restore. */ + return 0; } -static void pl050_init_keyboard(SysBusDevice *dev) +static int pl050_init_keyboard(SysBusDevice *dev) { - pl050_init(dev, 0); + return pl050_init(dev, 0); } -static void pl050_init_mouse(SysBusDevice *dev) +static int pl050_init_mouse(SysBusDevice *dev) { - pl050_init(dev, 1); + return pl050_init(dev, 1); } static void pl050_register_devices(void) |