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/ac97.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'hw/ac97.c') diff --git a/hw/ac97.c b/hw/ac97.c index 3c70d8c18..610ca6007 100644 --- a/hw/ac97.c +++ b/hw/ac97.c @@ -1291,7 +1291,7 @@ static void ac97_on_reset (void *opaque) mixer_reset (s); } -static void ac97_initfn (PCIDevice *dev) +static int ac97_initfn (PCIDevice *dev) { AC97LinkState *s = DO_UPCAST (AC97LinkState, dev, dev); uint8_t *c = s->dev.config; @@ -1337,6 +1337,7 @@ static void ac97_initfn (PCIDevice *dev) qemu_register_reset (ac97_on_reset, s); AUD_register_card ("ac97", &s->card); ac97_on_reset (s); + return 0; } int ac97_init (PCIBus *bus) -- cgit v1.2.3