From: Avi Kivity <avi@redhat.com>
Date: Sun, 1 Jan 2012 16:24:24 +0000 (+0200)
Subject: Fix wrong region_offset when overlaying a page with another
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2774c6d0ae20d32d75f77e7ed063ddbb854ca4c5;p=qemu-xen-4.4-testing.git

Fix wrong region_offset when overlaying a page with another

cpu_register_physical_memory_log() does not update region_offset
if a page was previously registered for the same address.  This
could cause mmio accesses going to the wrong place, by using the
old region_offset.

Signed-off-by: Avi Kivity <avi@redhat.com>
Acked-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Richard Henderson <rth@twiddle.net>
---

diff --git a/exec.c b/exec.c
index 8a3f6213a..c36683508 100644
--- a/exec.c
+++ b/exec.c
@@ -2542,6 +2542,7 @@ void cpu_register_physical_memory_log(target_phys_addr_t start_addr,
                 p->region_offset = 0;
             } else {
                 p->phys_offset = phys_offset;
+                p->region_offset = region_offset;
                 if ((phys_offset & ~TARGET_PAGE_MASK) <= IO_MEM_ROM ||
                     (phys_offset & IO_MEM_ROMD))
                     phys_offset += TARGET_PAGE_SIZE;