motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 01:03:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qdev: add return value to init() callbacks.

Browse source 
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:
Gerd Hoffmann 2009-08-14 10:36:05 +02:00 • committed by Anthony Liguori
parent 24e6f3551f
commit 81a322d4a1
102 changed files with 334 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

9
hw/sun4u.c
View file

@ -358,7 +358,7 @@ pci_ebus_init(PCIBus *bus, int devfn)
pci_create_simple(bus, devfn, "ebus");
}
static void
static int
pci_ebus_init1(PCIDevice *s)
{
isa_bus_new(&s->qdev);
@ -379,6 +379,7 @@ pci_ebus_init1(PCIDevice *s)
ebus_mmio_mapfunc);
pci_register_bar(s, 1, 0x800000, PCI_ADDRESS_SPACE_MEM,
ebus_mmio_mapfunc);
return 0;
}
static PCIDeviceInfo ebus_info = {
@ -428,12 +429,13 @@ static void prom_init(target_phys_addr_t addr, const char *bios_name)
}
}
static void prom_init1(SysBusDevice *dev)
static int prom_init1(SysBusDevice *dev)
{
ram_addr_t prom_offset;
prom_offset = qemu_ram_alloc(PROM_SIZE_MAX);
sysbus_init_mmio(dev, PROM_SIZE_MAX, prom_offset | IO_MEM_ROM);
return 0;
}
static SysBusDeviceInfo prom_info = {
@ -460,7 +462,7 @@ typedef struct RamDevice
} RamDevice;
/* System RAM */
static void ram_init1(SysBusDevice *dev)
static int ram_init1(SysBusDevice *dev)
{
ram_addr_t RAM_size, ram_offset;
RamDevice *d = FROM_SYSBUS(RamDevice, dev);
@ -469,6 +471,7 @@ static void ram_init1(SysBusDevice *dev)
ram_offset = qemu_ram_alloc(RAM_size);
sysbus_init_mmio(dev, RAM_size, ram_offset);
return 0;
}
static void ram_init(target_phys_addr_t addr, ram_addr_t RAM_size)