mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 08:13:54 -06:00
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>
This commit is contained in:
parent
24e6f3551f
commit
81a322d4a1
102 changed files with 334 additions and 193 deletions
|
@ -145,7 +145,7 @@ static void irq_handler(void *opaque, int irq, int level)
|
|||
update_irq(p);
|
||||
}
|
||||
|
||||
static void xilinx_intc_init(SysBusDevice *dev)
|
||||
static int xilinx_intc_init(SysBusDevice *dev)
|
||||
{
|
||||
struct xlx_pic *p = FROM_SYSBUS(typeof (*p), dev);
|
||||
int pic_regs;
|
||||
|
@ -155,6 +155,7 @@ static void xilinx_intc_init(SysBusDevice *dev)
|
|||
|
||||
pic_regs = cpu_register_io_memory(pic_read, pic_write, p);
|
||||
sysbus_init_mmio(dev, R_MAX * 4, pic_regs);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static SysBusDeviceInfo xilinx_intc_info = {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue