mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 08:43:55 -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
|
@ -420,7 +420,7 @@ static void slavio_intctl_reset(void *opaque)
|
|||
slavio_check_interrupts(s, 0);
|
||||
}
|
||||
|
||||
static void slavio_intctl_init1(SysBusDevice *dev)
|
||||
static int slavio_intctl_init1(SysBusDevice *dev)
|
||||
{
|
||||
SLAVIO_INTCTLState *s = FROM_SYSBUS(SLAVIO_INTCTLState, dev);
|
||||
int io_memory;
|
||||
|
@ -446,6 +446,7 @@ static void slavio_intctl_init1(SysBusDevice *dev)
|
|||
slavio_intctl_load, s);
|
||||
qemu_register_reset(slavio_intctl_reset, s);
|
||||
slavio_intctl_reset(s);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static SysBusDeviceInfo slavio_intctl_info = {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue