aboutsummaryrefslogtreecommitdiff
path: root/hw/sparc32_dma.c
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/sparc32_dma.c
parent24e6f3551f3c8ea7cc7524a3e64e84beca59618f (diff)
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/sparc32_dma.c')
-rw-r--r--hw/sparc32_dma.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/sparc32_dma.c b/hw/sparc32_dma.c
index 6b04d2498b..7f3150e858 100644
--- a/hw/sparc32_dma.c
+++ b/hw/sparc32_dma.c
@@ -244,7 +244,7 @@ static int dma_load(QEMUFile *f, void *opaque, int version_id)
return 0;
}
-static void sparc32_dma_init1(SysBusDevice *dev)
+static int sparc32_dma_init1(SysBusDevice *dev)
{
DMAState *s = FROM_SYSBUS(DMAState, dev);
int dma_io_memory;
@@ -259,6 +259,7 @@ static void sparc32_dma_init1(SysBusDevice *dev)
qdev_init_gpio_in(&dev->qdev, dma_set_irq, 1);
qdev_init_gpio_out(&dev->qdev, &s->dev_reset, 1);
+ return 0;
}
static SysBusDeviceInfo sparc32_dma_info = {