mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-06 09:13: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
|
@ -803,7 +803,7 @@ static void ne2000_cleanup(VLANClientState *vc)
|
|||
unregister_savevm("ne2000", s);
|
||||
}
|
||||
|
||||
static void pci_ne2000_init(PCIDevice *pci_dev)
|
||||
static int pci_ne2000_init(PCIDevice *pci_dev)
|
||||
{
|
||||
PCINE2000State *d = (PCINE2000State *)pci_dev;
|
||||
NE2000State *s;
|
||||
|
@ -830,6 +830,7 @@ static void pci_ne2000_init(PCIDevice *pci_dev)
|
|||
qemu_format_nic_info_str(s->vc, s->macaddr);
|
||||
|
||||
register_savevm("ne2000", -1, 3, ne2000_save, ne2000_load, s);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static PCIDeviceInfo ne2000_info = {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue