openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

util: move qemu_real_host_page_size/mask to osdep.h 

These only depend on the host and therefore belong in the common
osdep, not in a target-dependent object.

While at it, query the host during an init constructor, which guarantees
the page size will be well-defined throughout the execution of the program.

Suggested-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Emilio G. Cota <cota@braap.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Emilio G. Cota 2017-07-15 03:24:27 -04:00 committed by Richard Henderson
parent 619205fd1f
commit 3637cf58f9
5 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
exec.c
View File

@ -120,8 +120,6 @@ int use_icount;
uintptr_t qemu_host_page_size; uintptr_t qemu_host_page_size;
intptr_t qemu_host_page_mask; intptr_t qemu_host_page_mask;
uintptr_t qemu_real_host_page_size;
intptr_t qemu_real_host_page_mask;
bool set_preferred_target_page_bits(int bits) bool set_preferred_target_page_bits(int bits)
{ {
@ -3606,8 +3604,6 @@ void page_size_init(void)
{ {
/* NOTE: we can always suppose that qemu_host_page_size >= /* NOTE: we can always suppose that qemu_host_page_size >=
TARGET_PAGE_SIZE */ TARGET_PAGE_SIZE */
qemu_real_host_page_size = getpagesize();
qemu_real_host_page_mask = -(intptr_t)qemu_real_host_page_size;
if (qemu_host_page_size == 0) { if (qemu_host_page_size == 0) {
qemu_host_page_size = qemu_real_host_page_size; qemu_host_page_size = qemu_real_host_page_size;
} }

2
include/exec/cpu-all.h
View File

@ -229,8 +229,6 @@ extern int target_page_bits;
/* Using intptr_t ensures that qemu_*_page_mask is sign-extended even /* 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. * when intptr_t is 32-bit and we are aligning a long long.
*/ */
extern uintptr_t qemu_real_host_page_size;
extern intptr_t qemu_real_host_page_mask;
extern uintptr_t qemu_host_page_size; extern uintptr_t qemu_host_page_size;
extern intptr_t qemu_host_page_mask; extern intptr_t qemu_host_page_mask;

6
include/qemu/osdep.h
View File

@ -505,6 +505,12 @@ char *qemu_get_pid_name(pid_t pid);
*/ */
pid_t qemu_fork(Error **errp); pid_t qemu_fork(Error **errp);
/* 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_real_host_page_size;
extern intptr_t qemu_real_host_page_mask;
extern int qemu_icache_linesize; extern int qemu_icache_linesize;
extern int qemu_dcache_linesize; extern int qemu_dcache_linesize;

1
util/Makefile.objs
View File

@ -40,6 +40,7 @@ util-obj-y += buffer.o
util-obj-y += timed-average.o util-obj-y += timed-average.o
util-obj-y += base64.o util-obj-y += base64.o
util-obj-y += log.o util-obj-y += log.o
util-obj-y += pagesize.o
util-obj-y += qdist.o util-obj-y += qdist.o
util-obj-y += qht.o util-obj-y += qht.o
util-obj-y += range.o util-obj-y += range.o

18
util/pagesize.c Normal file
View File

@ -0,0 +1,18 @@
/*
* pagesize.c - query the host about its page size
*
* Copyright (C) 2017, Emilio G. Cota <cota@braap.org>
* License: GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
#include "qemu/osdep.h"
uintptr_t qemu_real_host_page_size;
intptr_t qemu_real_host_page_mask;
static void __attribute__((constructor)) init_real_host_page_size(void)
{
qemu_real_host_page_size = getpagesize();
qemu_real_host_page_mask = -(intptr_t)qemu_real_host_page_size;
}