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/spitz.c | |
| parent | 24e6f3551f3c8ea7cc7524a3e64e84beca59618f (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/spitz.c')
| -rw-r--r-- | hw/spitz.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/spitz.c b/hw/spitz.c index c1d629f76e..b9b59efc17 100644 --- a/hw/spitz.c +++ b/hw/spitz.c @@ -604,7 +604,7 @@ static int spitz_lcdtg_load(QEMUFile *f, void *opaque, int version_id) return 0; } -static void spitz_lcdtg_init(SSISlave *dev) +static int spitz_lcdtg_init(SSISlave *dev) { SpitzLCDTG *s = FROM_SSI_SLAVE(SpitzLCDTG, dev); @@ -614,6 +614,7 @@ static void spitz_lcdtg_init(SSISlave *dev) register_savevm("spitz-lcdtg", -1, 1, spitz_lcdtg_save, spitz_lcdtg_load, s); + return 0; } /* SSP devices */ @@ -697,7 +698,7 @@ static int spitz_ssp_load(QEMUFile *f, void *opaque, int version_id) return 0; } -static void corgi_ssp_init(SSISlave *dev) +static int corgi_ssp_init(SSISlave *dev) { CorgiSSPState *s = FROM_SSI_SLAVE(CorgiSSPState, dev); @@ -707,6 +708,7 @@ static void corgi_ssp_init(SSISlave *dev) s->bus[2] = ssi_create_bus(&dev->qdev, "ssi2"); register_savevm("spitz_ssp", -1, 1, spitz_ssp_save, spitz_ssp_load, s); + return 0; } static void spitz_ssp_attach(PXA2xxState *cpu) |