diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-08-14 10:36:05 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-08-27 20:43:28 -0500 |
| commit | 77ee233416a8285758b5c66174f7b368132cbf16 (patch) | |
| tree | cdca9840d0620d9e0b46d7b81c58abe04a372b78 /hw/sysbus.h | |
| parent | 0b6939c4d1ac0ca6d7c5e52611713981a413cf86 (diff) | |
| download | qemu-77ee233416a8285758b5c66174f7b368132cbf16.tar.gz qemu-77ee233416a8285758b5c66174f7b368132cbf16.tar.bz2 qemu-77ee233416a8285758b5c66174f7b368132cbf16.zip | |
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>
Diffstat (limited to 'hw/sysbus.h')
| -rw-r--r-- | hw/sysbus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/sysbus.h b/hw/sysbus.h index d48ca8ca3d..1a8f289c75 100644 --- a/hw/sysbus.h +++ b/hw/sysbus.h @@ -25,7 +25,7 @@ struct SysBusDevice { } mmio[QDEV_MAX_MMIO]; }; -typedef void (*sysbus_initfn)(SysBusDevice *dev); +typedef int (*sysbus_initfn)(SysBusDevice *dev); /* Macros to compensate for lack of type inheritance in C. */ #define sysbus_from_qdev(dev) ((SysBusDevice *)(dev)) |