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 | 77ee233416a8285758b5c66174f7b368132cbf16 (patch) | |
tree | cdca9840d0620d9e0b46d7b81c58abe04a372b78 /hw/tosa.c | |
parent | 0b6939c4d1ac0ca6d7c5e52611713981a413cf86 (diff) | |
download | qemu-77ee233416a8285758b5c66174f7b368132cbf16.tar.gz qemu-77ee233416a8285758b5c66174f7b368132cbf16.tar.bz2 qemu-77ee233416a8285758b5c66174f7b368132cbf16.zip |
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/tosa.c')
-rw-r--r-- | hw/tosa.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -121,9 +121,10 @@ static uint32_t tosa_ssp_tansfer(SSISlave *dev, uint32_t value) return 0; } -static void tosa_ssp_init(SSISlave *dev) +static int tosa_ssp_init(SSISlave *dev) { /* Nothing to do. */ + return 0; } typedef struct { @@ -180,9 +181,10 @@ static int tosa_dac_recv(i2c_slave *s) return -1; } -static void tosa_dac_init(i2c_slave *i2c) +static int tosa_dac_init(i2c_slave *i2c) { /* Nothing to do. */ + return 0; } static void tosa_tg_init(PXA2xxState *cpu) |