From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44993) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aadeG-0005Kx-PP for qemu-devel@nongnu.org; Tue, 01 Mar 2016 01:19:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aadeF-0005y9-SC for qemu-devel@nongnu.org; Tue, 01 Mar 2016 01:19:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39485) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aadeF-0005y4-NN for qemu-devel@nongnu.org; Tue, 01 Mar 2016 01:19:07 -0500 From: Fam Zheng Date: Tue, 1 Mar 2016 14:18:23 +0800 Message-Id: <1456813104-25902-7-git-send-email-famz@redhat.com> In-Reply-To: <1456813104-25902-1-git-send-email-famz@redhat.com> References: <1456813104-25902-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v2 6/7] exec: Factor out section_covers_addr List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , arei.gonglei@huawei.com, peterx@redhat.com This will be shared by the next patch. Also add a comment explaining the unobvious condition on "size.hi". Signed-off-by: Fam Zheng --- exec.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/exec.c b/exec.c index ad8b826..b4e2eb5 100644 --- a/exec.c +++ b/exec.c @@ -307,6 +307,16 @@ static void phys_page_compact_all(AddressSpaceDispatch *d, int nodes_nb) } } +static inline bool section_covers_addr(const MemoryRegionSection *section, + hwaddr addr) +{ + /* Memory topology clips a memory region to 2^64, size.hi >= 0 means the + * section must cover any addr. */ + return section->size.hi || + range_covers_byte(section->offset_within_address_space, + section->size.lo, addr); +} + static MemoryRegionSection *phys_page_find(PhysPageEntry lp, hwaddr addr, Node *nodes, MemoryRegionSection *sections) { @@ -322,9 +332,7 @@ static MemoryRegionSection *phys_page_find(PhysPageEntry lp, hwaddr addr, lp = p[(index >> (i * P_L2_BITS)) & (P_L2_SIZE - 1)]; } - if (sections[lp.ptr].size.hi || - range_covers_byte(sections[lp.ptr].offset_within_address_space, - sections[lp.ptr].size.lo, addr)) { + if (section_covers_addr(§ions[lp.ptr], addr)) { return §ions[lp.ptr]; } else { return §ions[PHYS_SECTION_UNASSIGNED]; -- 2.4.3