[PULL,03/12] cpu: use ROUND_UP() to define xxx_PAGE_ALIGN

Message ID	20191025142159.12459-4-richard.henderson@linaro.org
State	Superseded
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; From: Richard Henderson <richard.henderson@linaro.org> To: qemu-devel@nongnu.org Subject: [PULL 03/12] cpu: use ROUND_UP() to define xxx_PAGE_ALIGN Date: Fri, 25 Oct 2019 10:21:50 -0400 Message-Id: <20191025142159.12459-4-richard.henderson@linaro.org> In-Reply-To: <20191025142159.12459-1-richard.henderson@linaro.org> References: <20191025142159.12459-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: list Cc: peter.maydell@linaro.org, Wei Yang <richardw.yang@linux.intel.com> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	tcg patch queue \| expand [PULL,00/12] tcg patch queue [PULL,01/12] tci: Add implementation for INDEX_op_ld16u_i64 [PULL,02/12] cputlb: ensure _cmmu helper functions follow the naming standard [PULL,03/12] cpu: use ROUND_UP() to define xxx_PAGE_ALIGN [PULL,04/12] exec: Split out variable page size support to exec-vary.c [PULL,05/12] configure: Detect compiler support for __attribute__((alias)) [PULL,06/12] exec: Use const alias for TARGET_PAGE_BITS_VARY [PULL,07/12] exec: Restrict TARGET_PAGE_BITS_VARY assert to CONFIG_DEBUG_TCG [PULL,08/12] exec: Promote TARGET_PAGE_MASK to target_long [PULL,09/12] exec: Cache TARGET_PAGE_MASK for TARGET_PAGE_BITS_VARY [PULL,10/12] cputlb: Fix tlb_vaddr_to_host [PULL,11/12] translate-all: fix uninitialized tb->orig_tb [PULL,12/12] translate-all: Remove tb_alloc

Message ID

20191025142159.12459-4-richard.henderson@linaro.org

State

Superseded

Headers

Received-SPF: pass (google.com: domain of
	qemu-devel-bounces+patch=linaro.org@nongnu.org designates
	209.51.188.17 as permitted sender) client-ip=209.51.188.17; 
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 03/12] cpu: use ROUND_UP() to define xxx_PAGE_ALIGN
Date: Fri, 25 Oct 2019 10:21:50 -0400
Message-Id: <20191025142159.12459-4-richard.henderson@linaro.org>
In-Reply-To: <20191025142159.12459-1-richard.henderson@linaro.org>
References: <20191025142159.12459-1-richard.henderson@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: list
Cc: peter.maydell@linaro.org, Wei Yang <richardw.yang@linux.intel.com>
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

tcg patch queue | expand

Commit Message

Richard Henderson Oct. 25, 2019, 2:21 p.m. UTC

From: Wei Yang <richardw.yang@linux.intel.com>


Use ROUND_UP() to define, which is a little bit easy to read.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

Reviewed-by: Juan Quintela <quintela@redhat.com>

Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>

Message-Id: <20191013021145.16011-2-richardw.yang@linux.intel.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---
 include/exec/cpu-all.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

-- 
2.17.1

diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index ad9ab85eb3..255bb186ac 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -220,7 +220,7 @@  extern int target_page_bits;
 
 #define TARGET_PAGE_SIZE (1 << TARGET_PAGE_BITS)
 #define TARGET_PAGE_MASK ~(TARGET_PAGE_SIZE - 1)
-#define TARGET_PAGE_ALIGN(addr) (((addr) + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK)
+#define TARGET_PAGE_ALIGN(addr) ROUND_UP((addr), TARGET_PAGE_SIZE)
 
 /* Using intptr_t ensures that qemu_*_page_mask is sign-extended even
  * when intptr_t is 32-bit and we are aligning a long long.
@@ -228,9 +228,8 @@  extern int target_page_bits;
 extern uintptr_t qemu_host_page_size;
 extern intptr_t qemu_host_page_mask;
 
-#define HOST_PAGE_ALIGN(addr) (((addr) + qemu_host_page_size - 1) & qemu_host_page_mask)
-#define REAL_HOST_PAGE_ALIGN(addr) (((addr) + qemu_real_host_page_size - 1) & \
-                                    qemu_real_host_page_mask)
+#define HOST_PAGE_ALIGN(addr) ROUND_UP((addr), qemu_host_page_size)
+#define REAL_HOST_PAGE_ALIGN(addr) ROUND_UP((addr), qemu_real_host_page_size)
 
 /* same as PROT_xxx */
 #define PAGE_READ      0x0001

[PULL,03/12] cpu: use ROUND_UP() to define xxx_PAGE_ALIGN

Commit Message

Patch