summaryrefslogtreecommitdiff
path: root/kvm-all.c
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2008-11-19 15:09:54 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2008-11-19 15:09:54 +0000
commita3d6841ff82223f4c2bb05dbf3e29335e15f31c2 (patch)
tree22e56f9f2a138f23d3bbfea9999ebb75f09417d7 /kvm-all.c
parentd5b4eb4016e70ae4d80367306c826deb0defc04c (diff)
downloadqemu-a3d6841ff82223f4c2bb05dbf3e29335e15f31c2.tar.gz
kvm: de-register mem region for MMIO (Glauber Costa)
Besides unassigned memory, we also don't care about MMIO. So if we're giving an MMIO area that is already registered, wipe it out. Signed-off-by: Glauber Costa <glommer@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5753 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'kvm-all.c')
-rw-r--r--kvm-all.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kvm-all.c b/kvm-all.c
index 18e9361daa..5cb2db24ab 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -322,7 +322,7 @@ void kvm_set_phys_mem(target_phys_addr_t start_addr,
mem = kvm_lookup_slot(s, start_addr);
if (mem) {
- if (flags == IO_MEM_UNASSIGNED) {
+ if ((flags == IO_MEM_UNASSIGNED) || (flags >= TLB_MMIO)) {
mem->memory_size = 0;
mem->guest_phys_addr = start_addr;
mem->userspace_addr = 0;