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/twl92230.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'hw/twl92230.c') diff --git a/hw/twl92230.c b/hw/twl92230.c index 519a583..b15a8bf 100644 --- a/hw/twl92230.c +++ b/hw/twl92230.c @@ -875,7 +875,7 @@ static int menelaus_load(QEMUFile *f, void *opaque, int version_id) return 0; } -static void twl92230_init(i2c_slave *i2c) +static int twl92230_init(i2c_slave *i2c) { MenelausState *s = FROM_I2C_SLAVE(MenelausState, i2c); @@ -888,6 +888,7 @@ static void twl92230_init(i2c_slave *i2c) menelaus_reset(&s->i2c); register_savevm("menelaus", -1, 0, menelaus_save, menelaus_load, s); + return 0; } static I2CSlaveInfo twl92230_info = { -- cgit v1.1