From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acz5q-0003p1-Gm for qemu-devel@nongnu.org; Mon, 07 Mar 2016 12:37:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1acz5o-0003Ja-13 for qemu-devel@nongnu.org; Mon, 07 Mar 2016 12:37:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43430) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acz5n-0003JW-SL for qemu-devel@nongnu.org; Mon, 07 Mar 2016 12:37:15 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 85BB8C050900 for ; Mon, 7 Mar 2016 17:37:15 +0000 (UTC) From: Paolo Bonzini Date: Mon, 7 Mar 2016 18:36:54 +0100 Message-Id: <1457372221-19285-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1457372221-19285-1-git-send-email-pbonzini@redhat.com> References: <1457372221-19285-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 08/15] exec: Factor out section_covers_addr List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Fam Zheng From: Fam Zheng This will be shared by the next patch. Also add a comment explaining the unobvious condition on "size.hi". Signed-off-by: Fam Zheng Message-Id: <1456813104-25902-7-git-send-email-famz@redhat.com> [Small change to the comment. - Paolo] Signed-off-by: Paolo Bonzini --- exec.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/exec.c b/exec.c index ad8b826..9279af5 100644 --- a/exec.c +++ b/exec.c @@ -307,6 +307,17 @@ 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 [0, 2^64); size.hi > 0 means + * the section must cover the entire address space. + */ + 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 +333,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.5.0