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

uninorth: alter pci_pmac_init() and pci_pmac_u3_init() to return uninorth device

Browse source 
This is in preparation for moving the device wiring into the New World machine.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Mark Cave-Ayland 2018-03-06 20:30:50 +00:00 • committed by David Gibson
parent 5d2eaa0250
commit 0f4b5415c3
3 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
hw/pci-host/uninorth.c
View file

@ -166,9 +166,9 @@ static void pci_unin_internal_init(Object *obj)
sysbus_init_mmio(sbd, &h->data_mem);
}
PCIBus *pci_pmac_init(qemu_irq *pic,
MemoryRegion *address_space_mem,
MemoryRegion *address_space_io)
UNINState *pci_pmac_init(qemu_irq *pic,
MemoryRegion *address_space_mem,
MemoryRegion *address_space_io)
{
DeviceState *dev;
SysBusDevice *s;
@ -228,12 +228,12 @@ PCIBus *pci_pmac_init(qemu_irq *pic,
sysbus_mmio_map(s, 1, 0xf4c00000);
#endif
return h->bus;
return d;
}
PCIBus *pci_pmac_u3_init(qemu_irq *pic,
MemoryRegion *address_space_mem,
MemoryRegion *address_space_io)
UNINState *pci_pmac_u3_init(qemu_irq *pic,
MemoryRegion *address_space_mem,
MemoryRegion *address_space_io)
{
DeviceState *dev;
SysBusDevice *s;
@ -265,7 +265,7 @@ PCIBus *pci_pmac_u3_init(qemu_irq *pic,
pci_create_simple(h->bus, 11 << 3, "u3-agp");
return h->bus;
return d;
}
static void unin_main_pci_host_realize(PCIDevice *d, Error **errp)