From 81a322d4a1b68d47908a6630bf22897a289722aa Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 14 Aug 2009 10:36:05 +0200 Subject: 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 Signed-off-by: Anthony Liguori --- hw/stellaris_enet.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'hw/stellaris_enet.c') diff --git a/hw/stellaris_enet.c b/hw/stellaris_enet.c index ae0f09959..4596a699e 100644 --- a/hw/stellaris_enet.c +++ b/hw/stellaris_enet.c @@ -396,7 +396,7 @@ static void stellaris_enet_cleanup(VLANClientState *vc) qemu_free(s); } -static void stellaris_enet_init(SysBusDevice *dev) +static int stellaris_enet_init(SysBusDevice *dev) { stellaris_enet_state *s = FROM_SYSBUS(stellaris_enet_state, dev); @@ -415,6 +415,7 @@ static void stellaris_enet_init(SysBusDevice *dev) stellaris_enet_reset(s); register_savevm("stellaris_enet", -1, 1, stellaris_enet_save, stellaris_enet_load, s); + return 0; } static void stellaris_enet_register_devices(void) -- cgit v1.2.3