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/max7310.c | |
| parent | 24e6f3551f3c8ea7cc7524a3e64e84beca59618f (diff) | |
| download | focaccia-qemu-81a322d4a1b68d47908a6630bf22897a289722aa.tar.gz focaccia-qemu-81a322d4a1b68d47908a6630bf22897a289722aa.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/max7310.c')
| -rw-r--r-- | hw/max7310.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/max7310.c b/hw/max7310.c index a571e57e90..e7371337c1 100644 --- a/hw/max7310.c +++ b/hw/max7310.c @@ -190,7 +190,7 @@ static void max7310_gpio_set(void *opaque, int line, int level) /* MAX7310 is SMBus-compatible (can be used with only SMBus protocols), * but also accepts sequences that are not SMBus so return an I2C device. */ -static void max7310_init(i2c_slave *i2c) +static int max7310_init(i2c_slave *i2c) { MAX7310State *s = FROM_I2C_SLAVE(MAX7310State, i2c); @@ -200,6 +200,7 @@ static void max7310_init(i2c_slave *i2c) max7310_reset(&s->i2c); register_savevm("max7310", -1, 0, max7310_save, max7310_load, s); + return 0; } qemu_irq *max7310_gpio_in_get(i2c_slave *i2c) |