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/versatile_pci.c | |
| parent | 7ee28fd303003d70bb4c142e6ad4b92b7383b5b4 (diff) | |
| parent | 0e6264db2c04dfad79be60240bfacfcaf47f9d6c (diff) | |
Merge remote-tracking branch 'mst/for_anthony' into staging
Conflicts:
hw/usb-uhci.c
Diffstat (limited to 'hw/versatile_pci.c')
| -rw-r--r-- | hw/versatile_pci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/versatile_pci.c b/hw/versatile_pci.c index 2fed8a00fd..8e75ffccfb 100644 --- a/hw/versatile_pci.c +++ b/hw/versatile_pci.c @@ -133,12 +133,8 @@ static int pci_realview_init(SysBusDevice *dev) static int versatile_pci_host_init(PCIDevice *d) { - pci_config_set_vendor_id(d->config, PCI_VENDOR_ID_XILINX); - /* Both boards have the same device ID. Oh well. */ - pci_config_set_device_id(d->config, PCI_DEVICE_ID_XILINX_XC2VP30); pci_set_word(d->config + PCI_STATUS, PCI_STATUS_66MHZ | PCI_STATUS_DEVSEL_MEDIUM); - pci_config_set_class(d->config, PCI_CLASS_PROCESSOR_CO); pci_set_byte(d->config + PCI_LATENCY_TIMER, 0x10); return 0; } @@ -147,6 +143,10 @@ static PCIDeviceInfo versatile_pci_host_info = { .qdev.name = "versatile_pci_host", .qdev.size = sizeof(PCIDevice), .init = versatile_pci_host_init, + .vendor_id = PCI_VENDOR_ID_XILINX, + /* Both boards have the same device ID. Oh well. */ + .device_id = PCI_DEVICE_ID_XILINX_XC2VP30, + .class_id = PCI_CLASS_PROCESSOR_CO, }; static void versatile_pci_register_devices(void) |