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 | 77ee233416a8285758b5c66174f7b368132cbf16 (patch) | |
| tree | cdca9840d0620d9e0b46d7b81c58abe04a372b78 /hw/smc91c111.c | |
| parent | 0b6939c4d1ac0ca6d7c5e52611713981a413cf86 (diff) | |
| download | qemu-77ee233416a8285758b5c66174f7b368132cbf16.tar.gz qemu-77ee233416a8285758b5c66174f7b368132cbf16.tar.bz2 qemu-77ee233416a8285758b5c66174f7b368132cbf16.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/smc91c111.c')
| -rw-r--r-- | hw/smc91c111.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/smc91c111.c b/hw/smc91c111.c index fd288d4d97..a08bdb0a59 100644 --- a/hw/smc91c111.c +++ b/hw/smc91c111.c @@ -700,7 +700,7 @@ static void smc91c111_cleanup(VLANClientState *vc) qemu_free(s); } -static void smc91c111_init1(SysBusDevice *dev) +static int smc91c111_init1(SysBusDevice *dev) { smc91c111_state *s = FROM_SYSBUS(smc91c111_state, dev); @@ -717,6 +717,7 @@ static void smc91c111_init1(SysBusDevice *dev) smc91c111_cleanup, s); qemu_format_nic_info_str(s->vc, s->macaddr); /* ??? Save/restore. */ + return 0; } static void smc91c111_register_devices(void) |