diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2009-12-25 18:18:29 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2009-12-25 18:18:29 +0000 |
| commit | c71b5b4a9c4ee680bc48eb02386f1dc4311e0fdb (patch) | |
| tree | 1d1513ef0b0eb7cb1020b86668160c640b52ab7b /hw/pci.c | |
| parent | 2e01c8cf4b076b05013c87723e3fc710b50a0a7a (diff) | |
| download | focaccia-qemu-c71b5b4a9c4ee680bc48eb02386f1dc4311e0fdb.tar.gz focaccia-qemu-c71b5b4a9c4ee680bc48eb02386f1dc4311e0fdb.zip | |
PCI: partially revert 2e01c8cf4b076b05013c87723e3fc710b50a0a7a
Bus address conversion was not correct. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/pci.c')
| -rw-r--r-- | hw/pci.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/hw/pci.c b/hw/pci.c index b0c32c69e5..9722fce53d 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -899,7 +899,7 @@ static void pci_update_mappings(PCIDevice *d) { PCIIORegion *r; int i; - pcibus_t new_addr, filtered_size, bus_addr; + pcibus_t new_addr, filtered_size; for(i = 0; i < PCI_NUM_REGIONS; i++) { r = &d->io_regions[i]; @@ -921,7 +921,6 @@ static void pci_update_mappings(PCIDevice *d) continue; /* now do the real mapping */ - bus_addr = r->addr; if (r->addr != PCI_BAR_UNMAPPED) { if (r->type & PCI_BASE_ADDRESS_SPACE_IO) { int class; @@ -934,8 +933,7 @@ static void pci_update_mappings(PCIDevice *d) isa_unassign_ioport(r->addr, r->filtered_size); } } else { - bus_addr = pci_to_cpu_addr(d->bus, r->addr); - cpu_register_physical_memory(bus_addr, + cpu_register_physical_memory(pci_to_cpu_addr(d->bus, r->addr), r->filtered_size, IO_MEM_UNASSIGNED); qemu_unregister_coalesced_mmio(r->addr, r->filtered_size); @@ -951,7 +949,7 @@ static void pci_update_mappings(PCIDevice *d) * Teach them such cases, such that filtered_size < size and * addr & (size - 1) != 0. */ - r->map_func(d, i, bus_addr, r->filtered_size, r->type); + r->map_func(d, i, r->addr, r->filtered_size, r->type); } } } |