mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prep: qdev'ify Raven host bridge (PCIDevice)

Browse Source 
Move initialization of vendor ID, etc. to PCIDeviceInfo.
Introduce VMState.

Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Reviewed-by: Alexander Graf <agraf@suse.de>
Cc: Hervé Poussineau <hpoussin@reactos.org>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Andreas Färber 2012-01-03 01:50:07 +01:00
parent 48e937283a
commit 555260540d
1 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
hw/prep_pci.c
View File

@ -29,6 +29,10 @@
typedef PCIHostState PREPPCIState; typedef PCIHostState PREPPCIState;
typedef struct RavenPCIState {
PCIDevice dev;
} RavenPCIState;
static inline uint32_t PPC_PCIIO_config(target_phys_addr_t addr) static inline uint32_t PPC_PCIIO_config(target_phys_addr_t addr)
{ {
int i; int i;
@ -111,7 +115,6 @@ PCIBus *pci_prep_init(qemu_irq *pic,
MemoryRegion *address_space_io) MemoryRegion *address_space_io)
{ {
PREPPCIState *s; PREPPCIState *s;
PCIDevice *d;
s = g_malloc0(sizeof(PREPPCIState)); s = g_malloc0(sizeof(PREPPCIState));
s->bus = pci_register_bus(NULL, "pci", s->bus = pci_register_bus(NULL, "pci",
@ -133,16 +136,50 @@ PCIBus *pci_prep_init(qemu_irq *pic,
memory_region_init_io(&s->mmcfg, &PPC_PCIIO_ops, s, "pciio", 0x00400000); memory_region_init_io(&s->mmcfg, &PPC_PCIIO_ops, s, "pciio", 0x00400000);
memory_region_add_subregion(address_space_mem, 0x80800000, &s->mmcfg); memory_region_add_subregion(address_space_mem, 0x80800000, &s->mmcfg);
/* PCI host bridge */ pci_create_simple(s->bus, 0, "raven");
d = pci_register_device(s->bus, "PREP Host Bridge - Motorola Raven",
sizeof(PCIDevice), 0, NULL, NULL); return s->bus;
pci_config_set_vendor_id(d->config, PCI_VENDOR_ID_MOTOROLA); }
pci_config_set_device_id(d->config, PCI_DEVICE_ID_MOTOROLA_RAVEN);
d->config[0x08] = 0x00; // revision static int raven_init(PCIDevice *d)
pci_config_set_class(d->config, PCI_CLASS_BRIDGE_HOST); {
d->config[0x0C] = 0x08; // cache_line_size d->config[0x0C] = 0x08; // cache_line_size
d->config[0x0D] = 0x10; // latency_timer d->config[0x0D] = 0x10; // latency_timer
d->config[0x34] = 0x00; // capabilities_pointer d->config[0x34] = 0x00; // capabilities_pointer
return s->bus; return 0;
} }
static const VMStateDescription vmstate_raven = {
.name = "raven",
.version_id = 0,
.minimum_version_id = 0,
.fields = (VMStateField[]) {
VMSTATE_PCI_DEVICE(dev, RavenPCIState),
VMSTATE_END_OF_LIST()
},
};
static PCIDeviceInfo raven_info = {
.qdev.name = "raven",
.qdev.desc = "PReP Host Bridge - Motorola Raven",
.qdev.size = sizeof(RavenPCIState),
.qdev.vmsd = &vmstate_raven,
.qdev.no_user = 1,
.no_hotplug = 1,
.init = raven_init,
.vendor_id = PCI_VENDOR_ID_MOTOROLA,
.device_id = PCI_DEVICE_ID_MOTOROLA_RAVEN,
.revision = 0x00,
.class_id = PCI_CLASS_BRIDGE_HOST,
.qdev.props = (Property[]) {
DEFINE_PROP_END_OF_LIST()
},
};
static void raven_register_devices(void)
{
pci_qdev_register(&raven_info);
}
device_init(raven_register_devices)