From cf616802171905a9b6d087a69caa3b978b9cd741 Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sun, 27 Dec 2009 20:52:36 +0000 Subject: [PATCH] PCI: Fix bus address conversion Pass physical addresses to map functions instead of PCI bus addresses. Signed-off-by: Blue Swirl --- hw/pci.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/pci.c b/hw/pci.c index 9722fce53d..081438338d 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -949,7 +949,12 @@ 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, r->addr, r->filtered_size, r->type); + if (r->type & PCI_BASE_ADDRESS_SPACE_IO) { + r->map_func(d, i, r->addr, r->filtered_size, r->type); + } else { + r->map_func(d, i, pci_to_cpu_addr(d->bus, r->addr), + r->filtered_size, r->type); + } } } }