diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-22 07:11:09 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-22 07:11:09 -0500 |
| commit | fdba9594df8eb2e2ac16bba95308e4159ffbb9e4 (patch) | |
| tree | ae99a704abd1629e8f0a2de427814ad48bc85197 /hw/ppce500_pci.c | |
| parent | 7ee28fd303003d70bb4c142e6ad4b92b7383b5b4 (diff) | |
| parent | 0e6264db2c04dfad79be60240bfacfcaf47f9d6c (diff) | |
| download | focaccia-qemu-fdba9594df8eb2e2ac16bba95308e4159ffbb9e4.tar.gz focaccia-qemu-fdba9594df8eb2e2ac16bba95308e4159ffbb9e4.zip | |
Merge remote-tracking branch 'mst/for_anthony' into staging
Conflicts: hw/usb-uhci.c
Diffstat (limited to 'hw/ppce500_pci.c')
| -rw-r--r-- | hw/ppce500_pci.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/hw/ppce500_pci.c b/hw/ppce500_pci.c index 069af9691a..fc11af4374 100644 --- a/hw/ppce500_pci.c +++ b/hw/ppce500_pci.c @@ -304,20 +304,13 @@ static int e500_pcihost_initfn(SysBusDevice *dev) return 0; } -static int e500_host_bridge_initfn(PCIDevice *dev) -{ - pci_config_set_vendor_id(dev->config, PCI_VENDOR_ID_FREESCALE); - pci_config_set_device_id(dev->config, PCI_DEVICE_ID_MPC8533E); - pci_config_set_class(dev->config, PCI_CLASS_PROCESSOR_POWERPC); - - return 0; -} - static PCIDeviceInfo e500_host_bridge_info = { .qdev.name = "e500-host-bridge", .qdev.desc = "Host bridge", .qdev.size = sizeof(PCIDevice), - .init = e500_host_bridge_initfn, + .vendor_id = PCI_VENDOR_ID_FREESCALE, + .device_id = PCI_DEVICE_ID_MPC8533E, + .class_id = PCI_CLASS_PROCESSOR_POWERPC, }; static SysBusDeviceInfo e500_pcihost_info = { |