summary refs log tree commit diff stats
path: root/hw/isa.h
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-08-14 10:36:05 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-08-27 20:43:28 -0500
commit81a322d4a1b68d47908a6630bf22897a289722aa (patch)
treecdca9840d0620d9e0b46d7b81c58abe04a372b78 /hw/isa.h
parent24e6f3551f3c8ea7cc7524a3e64e84beca59618f (diff)
downloadfocaccia-qemu-81a322d4a1b68d47908a6630bf22897a289722aa.tar.gz
focaccia-qemu-81a322d4a1b68d47908a6630bf22897a289722aa.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/isa.h')
-rw-r--r--hw/isa.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/isa.h b/hw/isa.h
index 872e3ef011..d98acd5bc4 100644
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -18,7 +18,7 @@ struct ISADevice {
     int nirqs;
 };
 
-typedef void (*isa_qdev_initfn)(ISADevice *dev);
+typedef int (*isa_qdev_initfn)(ISADevice *dev);
 struct ISADeviceInfo {
     DeviceInfo qdev;
     isa_qdev_initfn init;