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/iommu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'hw/iommu.c') diff --git a/hw/iommu.c b/hw/iommu.c index ff8b415aea..e15cc91ce8 100644 --- a/hw/iommu.c +++ b/hw/iommu.c @@ -366,7 +366,7 @@ static void iommu_reset(void *opaque) s->regs[IOMMU_MASK_ID] = IOMMU_TS_MASK; } -static void iommu_init1(SysBusDevice *dev) +static int iommu_init1(SysBusDevice *dev) { IOMMUState *s = FROM_SYSBUS(IOMMUState, dev); int io; @@ -379,6 +379,7 @@ static void iommu_init1(SysBusDevice *dev) register_savevm("iommu", -1, 2, iommu_save, iommu_load, s); qemu_register_reset(iommu_reset, s); iommu_reset(s); + return 0; } static SysBusDeviceInfo iommu_info = { -- cgit v1.2.3