exec/cpu: Make host pages variables / macros 'target agnostic'
PATCH 1/1 exec/cpu: Make host pages variables / macros 'target agnostic'
"host" pages are related to the *host* not the *target*, thus the qemu_host_page_size / qemu_host_page_mask variables and the HOST_PAGE_ALIGN() / REAL_HOST_PAGE_ALIGN() macros can be moved to "exec/cpu-common.h" which is target agnostic.
--- include/exec/cpu-all.h | 9 --------- include/exec/cpu-common.h | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-)
include/exec/cpu-all.h +0 -9
@@ -234,15 +234,6 @@ extern const TargetPageBits target_page;#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. -*/ -extern uintptr_t qemu_host_page_size; -extern intptr_t qemu_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#define PAGE_WRITE 0x0002
include/exec/cpu-common.h +9 -0
@@ -7,6 +7,15 @@#include "exec/hwaddr.h" #endif +/* 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. +*/ +extern uintptr_t qemu_host_page_size; +extern intptr_t qemu_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) +/* The CPU list lock nests outside page_(un)lock or mmap_(un)lock */ void qemu_init_cpu_list (void );void cpu_list_lock (void );
Signature · 1 line
2.34.1
Quoted 41 lines · Philippe Mathieu-Daudé
"host" pages are related to the *host* not the *target*, thus the
qemu_host_page_size/qemu_host_page_maskvariables and theHOST_PAGE_ALIGN()/REAL_HOST_PAGE_ALIGN()macros can be moved to "exec/cpu-common.h" which is target agnostic.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/exec/cpu-all.h | 9 --------- include/exec/cpu-common.h | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-)include/exec/cpu-all.h +0
-9@@ -234,15 +234,6 @@ extern const TargetPageBits target_page;#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. -*/ -extern uintptr_t qemu_host_page_size; -extern intptr_t qemu_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#define PAGE_WRITE 0x0002include/exec/cpu-common.h +2
-0@@ -7,6 +7,15 @@#include "exec/hwaddr.h" #endif +/* 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.
include/exec/cpu-common.h line 21
Quoted 10 lines
include/exec/cpu-common.h +7
-0+*/ +extern uintptr_t qemu_host_page_size; +extern intptr_t qemu_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) +/* The CPU list lock nests outside page_(un)lock or mmap_(un)lock */ void qemu_init_cpu_list (void );void cpu_list_lock (void );
Signature · 3 lines
Thanks, David / dhildenb
Paolo Bonzini
AppliedQuoted 6 lines · Philippe Mathieu-Daudé via
"host" pages are related to the *host* not the *target*, thus the
qemu_host_page_size/qemu_host_page_maskvariables and theHOST_PAGE_ALIGN()/REAL_HOST_PAGE_ALIGN()macros can be moved to "exec/cpu-common.h" which is target agnostic.Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Queued, thanks.
Paolo
Quoted 45 lines
--- include/exec/cpu-all.h | 9 --------- include/exec/cpu-common.h | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-)include/exec/cpu-all.h +0
-9@@ -234,15 +234,6 @@ extern const TargetPageBits target_page;#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. -*/ -extern uintptr_t qemu_host_page_size; -extern intptr_t qemu_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#define PAGE_WRITE 0x0002include/exec/cpu-common.h +9
-0@@ -7,6 +7,15 @@#include "exec/hwaddr.h" #endif +/* 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. +*/ +extern uintptr_t qemu_host_page_size; +extern intptr_t qemu_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) +/* The CPU list lock nests outside page_(un)lock or mmap_(un)lock */ void qemu_init_cpu_list (void );void cpu_list_lock (void );