From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, Wei Yang <richardw.yang@linux.intel.com>
Subject: [PULL v2 03/12] cpu: use ROUND_UP() to define xxx_PAGE_ALIGN
Date: Mon, 28 Oct 2019 15:59:28 +0100 [thread overview]
Message-ID: <20191028145937.10914-4-richard.henderson@linaro.org> (raw)
In-Reply-To: <20191028145937.10914-1-richard.henderson@linaro.org>
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(-)
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
--
2.17.1
next prev parent reply other threads:[~2019-10-28 15:08 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-28 14:59 [PULL v2 00/12] tcg patch queue Richard Henderson
2019-10-28 14:59 ` [PULL v2 01/12] tci: Add implementation for INDEX_op_ld16u_i64 Richard Henderson
2019-10-28 14:59 ` [PULL v2 02/12] cputlb: ensure _cmmu helper functions follow the naming standard Richard Henderson
2019-10-28 14:59 ` Richard Henderson [this message]
2019-10-28 14:59 ` [PULL v2 04/12] exec: Split out variable page size support to exec-vary.c Richard Henderson
2019-10-28 14:59 ` [PULL v2 05/12] configure: Detect compiler support for __attribute__((alias)) Richard Henderson
2019-10-28 14:59 ` [PULL v2 06/12] exec: Use const alias for TARGET_PAGE_BITS_VARY Richard Henderson
2019-10-28 14:59 ` [PULL v2 07/12] exec: Restrict TARGET_PAGE_BITS_VARY assert to CONFIG_DEBUG_TCG Richard Henderson
2019-10-28 14:59 ` [PULL v2 08/12] exec: Promote TARGET_PAGE_MASK to target_long Richard Henderson
2019-10-28 14:59 ` [PULL v2 09/12] exec: Cache TARGET_PAGE_MASK for TARGET_PAGE_BITS_VARY Richard Henderson
2019-10-28 14:59 ` [PULL v2 10/12] cputlb: Fix tlb_vaddr_to_host Richard Henderson
2019-10-28 14:59 ` [PULL v2 11/12] translate-all: fix uninitialized tb->orig_tb Richard Henderson
2019-10-28 14:59 ` [PULL v2 12/12] translate-all: Remove tb_alloc Richard Henderson
2019-10-28 17:20 ` [PULL v2 00/12] tcg patch queue no-reply
2019-10-29 15:32 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191028145937.10914-4-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richardw.yang@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).