mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 15:53: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
|
@ -189,7 +189,7 @@ static void timer_hit(void *opaque)
|
|||
timer_update_irq(t);
|
||||
}
|
||||
|
||||
static void xilinx_timer_init(SysBusDevice *dev)
|
||||
static int xilinx_timer_init(SysBusDevice *dev)
|
||||
{
|
||||
struct timerblock *t = FROM_SYSBUS(typeof (*t), dev);
|
||||
unsigned int i;
|
||||
|
@ -212,6 +212,7 @@ static void xilinx_timer_init(SysBusDevice *dev)
|
|||
|
||||
timer_regs = cpu_register_io_memory(timer_read, timer_write, t);
|
||||
sysbus_init_mmio(dev, R_MAX * 4 * t->nr_timers, timer_regs);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static SysBusDeviceInfo xilinx_timer_info = {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue