commit 88266249701032211c1d7449460d063fbc01bf12
author Hu Tao <hutao@cn.fujitsu.com> Thu Aug 29 18:21:16 2013 +0800
committer Paolo Bonzini <pbonzini@redhat.com> Thu Sep 05 18:11:37 2013 +0200
tree 117a640abbe2a15148c54035cf423d44c19dfac3
parent 098178f2749a63fbbb1a626dcc7d939d5cb2bde7

exec: check offset_within_address_space for register subpage

If offset_within_address_space falls in a page, then we register a
subpage. So check offset_within_address_space rather than
offset_within_region.

Cc: qemu-stable@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: "Andreas Färber" <afaerber@suse.de>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

exec.c

diff --git a/exec.c b/exec.c
index b52ec80..e6f04d8 100644
--- a/exec.c
+++ b/exec.c
@@ -854,7 +854,7 @@
         now = remain;
         if (int128_lt(remain.size, page_size)) {
             register_subpage(d, &now);
-        } else if (remain.offset_within_region & ~TARGET_PAGE_MASK) {
+        } else if (remain.offset_within_address_space & ~TARGET_PAGE_MASK) {
             now.size = page_size;
             register_subpage(d, &now);
         } else {