motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 08:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qdev: add return value to init() callbacks.

Browse source 
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:
Gerd Hoffmann 2009-08-14 10:36:05 +02:00 • committed by Anthony Liguori
parent 24e6f3551f
commit 81a322d4a1
102 changed files with 334 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

9
hw/qdev.c
View file

@ -199,16 +199,19 @@ DeviceState *qdev_device_add(QemuOpts *opts)
qdev_free(qdev);
return NULL;
}
qdev_init(qdev);
if (qdev_init(qdev) != 0) {
qdev_free(qdev);
return NULL;
}
return qdev;
}
/* Initialize a device. Device properties should be set before calling
this function. IRQs and MMIO regions should be connected/mapped after
calling this function. */
void qdev_init(DeviceState *dev)
int qdev_init(DeviceState *dev)
{
dev->info->init(dev, dev->info);
return dev->info->init(dev, dev->info);
}
/* Unlink device from bus and free the structure. */