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/syborg_interrupt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'hw/syborg_interrupt.c') diff --git a/hw/syborg_interrupt.c b/hw/syborg_interrupt.c index ae202c650b..f3a1767296 100644 --- a/hw/syborg_interrupt.c +++ b/hw/syborg_interrupt.c @@ -202,7 +202,7 @@ static int syborg_int_load(QEMUFile *f, void *opaque, int version_id) return 0; } -static void syborg_int_init(SysBusDevice *dev) +static int syborg_int_init(SysBusDevice *dev) { SyborgIntState *s = FROM_SYSBUS(SyborgIntState, dev); int iomemtype; @@ -215,6 +215,7 @@ static void syborg_int_init(SysBusDevice *dev) s->flags = qemu_mallocz(s->num_irqs * sizeof(syborg_int_flags)); register_savevm("syborg_int", -1, 1, syborg_int_save, syborg_int_load, s); + return 0; } static SysBusDeviceInfo syborg_int_info = { -- cgit v1.2.1