diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-05-05 13:05:32 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-05-05 13:05:32 -0500 |
| commit | 3964f535c35c08470ac69bd553282af500bc8bb0 (patch) | |
| tree | ba83992b5bcfda451371174ce3e8be1496c70c73 /hw/usb-ohci.c | |
| parent | a69fb35079f682f99dd4d077b76232763d832d42 (diff) | |
| parent | 5300f1a5487f67f0bde8ee1081b799108668cb1d (diff) | |
| download | qemu-3964f535c35c08470ac69bd553282af500bc8bb0.zip qemu-3964f535c35c08470ac69bd553282af500bc8bb0.tar.gz qemu-3964f535c35c08470ac69bd553282af500bc8bb0.tar.bz2 | |
Merge remote-tracking branch 'mst/for_anthony' into staging
Diffstat (limited to 'hw/usb-ohci.c')
| -rw-r--r-- | hw/usb-ohci.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c index 8090c17..32913eb 100644 --- a/hw/usb-ohci.c +++ b/hw/usb-ohci.c @@ -1708,13 +1708,6 @@ typedef struct { OHCIState state; } OHCIPCIState; -static void ohci_mapfunc(PCIDevice *pci_dev, int i, - pcibus_t addr, pcibus_t size, int type) -{ - OHCIPCIState *ohci = DO_UPCAST(OHCIPCIState, pci_dev, pci_dev); - cpu_register_physical_memory(addr, size, ohci->state.mem); -} - static int usb_ohci_initfn_pci(struct PCIDevice *dev) { OHCIPCIState *ohci = DO_UPCAST(OHCIPCIState, pci_dev, dev); @@ -1732,8 +1725,7 @@ static int usb_ohci_initfn_pci(struct PCIDevice *dev) ohci->state.irq = ohci->pci_dev.irq[0]; /* TODO: avoid cast below by using dev */ - pci_register_bar(&ohci->pci_dev, 0, 256, - PCI_BASE_ADDRESS_SPACE_MEMORY, ohci_mapfunc); + pci_register_bar_simple(&ohci->pci_dev, 0, 256, 0, ohci->state.mem); return 0; } |