From 81a322d4a1b68d47908a6630bf22897a289722aa Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 14 Aug 2009 10:36:05 +0200 Subject: 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 Signed-off-by: Anthony Liguori --- hw/sysbus.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/sysbus.h') 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)) -- cgit v1.2.1