ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

versatile_pci: Change to subclassing TYPE_PCI_HOST_BRIDGE 

Change versatile_pci to subclass TYPE_PCI_HOST_BRIDGE and generally
handle PCI in a more QOM-like fashion.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Paul Brook <paul@codesourcery.com>
This commit is contained in:
Peter Maydell 2013-04-19 11:15:18 +01:00
parent cd93dbf375
commit 0688810b41
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
hw/pci-host/versatile.c
View File

@ -9,16 +9,22 @@
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "hw/pci/pci_bus.h"
#include "hw/pci/pci_host.h" #include "hw/pci/pci_host.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
typedef struct { typedef struct {
SysBusDevice busdev; PCIHostState parent_obj;
qemu_irq irq[4]; qemu_irq irq[4];
int realview;
MemoryRegion mem_config; MemoryRegion mem_config;
MemoryRegion mem_config2; MemoryRegion mem_config2;
MemoryRegion isa; MemoryRegion isa;
PCIBus pci_bus;
PCIDevice pci_dev;
/* Constant for life of device: */
int realview;
} PCIVPBState; } PCIVPBState;
#define TYPE_VERSATILE_PCI "versatile_pci" #define TYPE_VERSATILE_PCI "versatile_pci"
@ -66,20 +72,31 @@ static void pci_vpb_set_irq(void *opaque, int irq_num, int level)
qemu_set_irq(pic[irq_num], level); qemu_set_irq(pic[irq_num], level);
} }
static void pci_vpb_init(Object *obj)
{
PCIHostState *h = PCI_HOST_BRIDGE(obj);
PCIVPBState *s = PCI_VPB(obj);
pci_bus_new_inplace(&s->pci_bus, DEVICE(obj), "pci",
get_system_memory(), get_system_io(),
PCI_DEVFN(11, 0), TYPE_PCI_BUS);
h->bus = &s->pci_bus;
object_initialize(&s->pci_dev, TYPE_VERSATILE_PCI_HOST);
qdev_set_parent_bus(DEVICE(&s->pci_dev), BUS(&s->pci_bus));
}
static void pci_vpb_realize(DeviceState *dev, Error **errp) static void pci_vpb_realize(DeviceState *dev, Error **errp)
{ {
PCIVPBState *s = PCI_VPB(dev); PCIVPBState *s = PCI_VPB(dev);
SysBusDevice *sbd = SYS_BUS_DEVICE(dev); SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
PCIBus *bus;
int i; int i;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
sysbus_init_irq(sbd, &s->irq[i]); sysbus_init_irq(sbd, &s->irq[i]);
} }
bus = pci_register_bus(dev, "pci",
pci_vpb_set_irq, pci_vpb_map_irq, s->irq, pci_bus_irqs(&s->pci_bus, pci_vpb_set_irq, pci_vpb_map_irq, s->irq, 4);
get_system_memory(), get_system_io(),
PCI_DEVFN(11, 0), 4, TYPE_PCI_BUS);
/* ??? Register memory space. */ /* ??? Register memory space. */
@ -88,16 +105,17 @@ static void pci_vpb_realize(DeviceState *dev, Error **errp)
* 1 : PCI config window * 1 : PCI config window
* 2 : PCI IO window * 2 : PCI IO window
*/ */
memory_region_init_io(&s->mem_config, &pci_vpb_config_ops, bus, memory_region_init_io(&s->mem_config, &pci_vpb_config_ops, &s->pci_bus,
"pci-vpb-selfconfig", 0x1000000); "pci-vpb-selfconfig", 0x1000000);
sysbus_init_mmio(sbd, &s->mem_config); sysbus_init_mmio(sbd, &s->mem_config);
memory_region_init_io(&s->mem_config2, &pci_vpb_config_ops, bus, memory_region_init_io(&s->mem_config2, &pci_vpb_config_ops, &s->pci_bus,
"pci-vpb-config", 0x1000000); "pci-vpb-config", 0x1000000);
sysbus_init_mmio(sbd, &s->mem_config2); sysbus_init_mmio(sbd, &s->mem_config2);
isa_mmio_setup(&s->isa, 0x0100000); isa_mmio_setup(&s->isa, 0x0100000);
sysbus_init_mmio(sbd, &s->isa); sysbus_init_mmio(sbd, &s->isa);
pci_create_simple(bus, -1, "versatile_pci_host"); /* TODO Remove once realize propagates to child devices. */
object_property_set_bool(OBJECT(&s->pci_dev), true, "realized", errp);
} }
static int versatile_pci_host_init(PCIDevice *d) static int versatile_pci_host_init(PCIDevice *d)
@ -134,8 +152,9 @@ static void pci_vpb_class_init(ObjectClass *klass, void *data)
static const TypeInfo pci_vpb_info = { static const TypeInfo pci_vpb_info = {
.name = TYPE_VERSATILE_PCI, .name = TYPE_VERSATILE_PCI,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_PCI_HOST_BRIDGE,
.instance_size = sizeof(PCIVPBState), .instance_size = sizeof(PCIVPBState),
.instance_init = pci_vpb_init,
.class_init = pci_vpb_class_init, .class_init = pci_vpb_class_init,
}; };