mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 10:13:56 -06:00
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>
This commit is contained in:
parent
24e6f3551f
commit
81a322d4a1
102 changed files with 334 additions and 193 deletions
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue