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/etraxfs_ser.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'hw/etraxfs_ser.c') diff --git a/hw/etraxfs_ser.c b/hw/etraxfs_ser.c index 5b5b6c0..e1f9615 100644 --- a/hw/etraxfs_ser.c +++ b/hw/etraxfs_ser.c @@ -161,7 +161,7 @@ static void serial_event(void *opaque, int event) } -static void etraxfs_ser_init(SysBusDevice *dev) +static int etraxfs_ser_init(SysBusDevice *dev) { struct etrax_serial *s = FROM_SYSBUS(typeof (*s), dev); int ser_regs; @@ -178,6 +178,7 @@ static void etraxfs_ser_init(SysBusDevice *dev) qemu_chr_add_handlers(s->chr, serial_can_receive, serial_receive, serial_event, s); + return 0; } static void etraxfs_serial_register(void) -- cgit v1.1