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/max111x.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/max111x.c')
| -rw-r--r-- | hw/max111x.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/hw/max111x.c b/hw/max111x.c index f7023a8e9b..bd656bb534 100644 --- a/hw/max111x.c +++ b/hw/max111x.c @@ -125,7 +125,7 @@ static int max111x_load(QEMUFile *f, void *opaque, int version_id) return 0; } -static void max111x_init(SSISlave *dev, int inputs) +static int max111x_init(SSISlave *dev, int inputs) { MAX111xState *s = FROM_SSI_SLAVE(MAX111xState, dev); @@ -144,16 +144,17 @@ static void max111x_init(SSISlave *dev, int inputs) s->com = 0; register_savevm("max111x", -1, 0, max111x_save, max111x_load, s); + return 0; } -static void max1110_init(SSISlave *dev) +static int max1110_init(SSISlave *dev) { - max111x_init(dev, 8); + return max111x_init(dev, 8); } -static void max1111_init(SSISlave *dev) +static int max1111_init(SSISlave *dev) { - max111x_init(dev, 4); + return max111x_init(dev, 4); } void max111x_set_input(DeviceState *dev, int line, uint8_t value) |