summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2010-04-11 23:59:39 +0200
committerAurelien Jarno <aurelien@aurel32.net>2010-04-14 00:54:38 +0200
commit1ce4fad939d2d54d6e45c109b17dfab6d03f1160 (patch)
tree23c5193dfb024604bb2c26f11f5d342b88bc252c /default-configs
parentFix incoming migration with iothread (diff)
downloadqemu-kvm-1ce4fad939d2d54d6e45c109b17dfab6d03f1160.tar.gz
qemu-kvm-1ce4fad939d2d54d6e45c109b17dfab6d03f1160.tar.bz2
qemu-kvm-1ce4fad939d2d54d6e45c109b17dfab6d03f1160.zip
sh_pci: fix memory and I/O access
Since commit 8da3ff180974732fc4272cb4433fef85c1822961 ("MMIO callback interface changes"), the addresses passed to the I/O functions are an offset to the start of the area. As a consequence, there is no need to correct the address using the value of IOBR. This make possible the use of the default MMIO functions. Moreover the addresses are now remaped when the value if IOBR change. The memory area corresponds to the devices behing the PCI bus, it should not be mapped by the PCI controller. Remove the corresponding code. Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> (cherry-picked from commit 5ba9e9522cf572715ca1966b292f64fb78342e22)
Diffstat (limited to 'default-configs')
-rw-r--r--default-configs/sh4-softmmu.mak1
-rw-r--r--default-configs/sh4eb-softmmu.mak1
2 files changed, 2 insertions, 0 deletions
diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
index 4f912eccd..a89f52b16 100644
--- a/default-configs/sh4-softmmu.mak
+++ b/default-configs/sh4-softmmu.mak
@@ -2,3 +2,4 @@
CONFIG_USB_OHCI=y
CONFIG_PTIMER=y
+CONFIG_ISA_MMIO=y
diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak
index 93d0c76f2..762385be3 100644
--- a/default-configs/sh4eb-softmmu.mak
+++ b/default-configs/sh4eb-softmmu.mak
@@ -2,3 +2,4 @@
CONFIG_USB_OHCI=y
CONFIG_PTIMER=y
+CONFIG_ISA_MMIO=y