From 81a322d4a1b68d47908a6630bf22897a289722aa Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 14 Aug 2009 10:36:05 +0200 Subject: 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 Signed-off-by: Anthony Liguori --- hw/i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hw/i2c.c') diff --git a/hw/i2c.c b/hw/i2c.c index 7a1b358..5473772 100644 --- a/hw/i2c.c +++ b/hw/i2c.c @@ -149,14 +149,14 @@ void i2c_slave_load(QEMUFile *f, i2c_slave *dev) } } -static void i2c_slave_qdev_init(DeviceState *dev, DeviceInfo *base) +static int i2c_slave_qdev_init(DeviceState *dev, DeviceInfo *base) { I2CSlaveInfo *info = container_of(base, I2CSlaveInfo, qdev); i2c_slave *s = I2C_SLAVE_FROM_QDEV(dev); s->info = info; - info->init(s); + return info->init(s); } void i2c_register_slave(I2CSlaveInfo *info) -- cgit v1.1