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/bitbang_i2c.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/bitbang_i2c.c')
| -rw-r--r-- | hw/bitbang_i2c.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/bitbang_i2c.c b/hw/bitbang_i2c.c index 9ab04cc42e..443ddb2b0f 100644 --- a/hw/bitbang_i2c.c +++ b/hw/bitbang_i2c.c @@ -153,7 +153,7 @@ static void bitbang_i2c_gpio_set(void *opaque, int irq, int level) i2c->last_clock = clock; } -static void bitbang_i2c_init(SysBusDevice *dev) +static int bitbang_i2c_init(SysBusDevice *dev) { bitbang_i2c_interface *s = FROM_SYSBUS(bitbang_i2c_interface, dev); i2c_bus *bus; @@ -168,6 +168,8 @@ static void bitbang_i2c_init(SysBusDevice *dev) qdev_init_gpio_in(&dev->qdev, bitbang_i2c_gpio_set, 2); qdev_init_gpio_out(&dev->qdev, &s->out, 1); + + return 0; } static void bitbang_i2c_register(void) |