diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-08-14 10:36:05 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-08-27 20:43:28 -0500 |
| commit | 81a322d4a1b68d47908a6630bf22897a289722aa (patch) | |
| tree | cdca9840d0620d9e0b46d7b81c58abe04a372b78 /hw/pl080.c | |
| parent | 24e6f3551f3c8ea7cc7524a3e64e84beca59618f (diff) | |
| download | qemu-81a322d4a1b68d47908a6630bf22897a289722aa.tar.gz | |
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/pl080.c')
| -rw-r--r-- | hw/pl080.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/hw/pl080.c b/hw/pl080.c index a6ea8ebf96..2df65fab94 100644 --- a/hw/pl080.c +++ b/hw/pl080.c @@ -319,7 +319,7 @@ static CPUWriteMemoryFunc * const pl080_writefn[] = { pl080_write }; -static void pl08x_init(SysBusDevice *dev, int nchannels) +static int pl08x_init(SysBusDevice *dev, int nchannels) { int iomemtype; pl080_state *s = FROM_SYSBUS(pl080_state, dev); @@ -330,16 +330,17 @@ static void pl08x_init(SysBusDevice *dev, int nchannels) sysbus_init_irq(dev, &s->irq); s->nchannels = nchannels; /* ??? Save/restore. */ + return 0; } -static void pl080_init(SysBusDevice *dev) +static int pl080_init(SysBusDevice *dev) { - pl08x_init(dev, 8); + return pl08x_init(dev, 8); } -static void pl081_init(SysBusDevice *dev) +static int pl081_init(SysBusDevice *dev) { - pl08x_init(dev, 2); + return pl08x_init(dev, 2); } /* The PL080 and PL081 are the same except for the number of channels |