mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-user: Remove qemu_host_page_size from main

Browse Source 
Use qemu_real_host_page_size() instead.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
Acked-by: Helge Deller <deller@gmx.de>
Message-Id: <20240102015808.132373-16-richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2024-01-02 12:57:50 +11:00
parent 9260bd4013
commit 13c1339755
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
linux-user/main.c
View File

@ -781,7 +781,7 @@ int main(int argc, char **argv, char **envp)
} }
cpu_type = parse_cpu_option(cpu_model); cpu_type = parse_cpu_option(cpu_model);
/* init tcg before creating CPUs and to get qemu_host_page_size */ /* init tcg before creating CPUs */
{ {
AccelState *accel = current_accel(); AccelState *accel = current_accel();
AccelClass *ac = ACCEL_GET_CLASS(accel); AccelClass *ac = ACCEL_GET_CLASS(accel);
@ -804,8 +804,10 @@ int main(int argc, char **argv, char **envp)
*/ */
max_reserved_va = MAX_RESERVED_VA(cpu); max_reserved_va = MAX_RESERVED_VA(cpu);
if (reserved_va != 0) { if (reserved_va != 0) {
if ((reserved_va + 1) % qemu_host_page_size) { int host_page_size = qemu_real_host_page_size();
char *s = size_to_str(qemu_host_page_size);
if ((reserved_va + 1) % host_page_size) {
char *s = size_to_str(host_page_size);
fprintf(stderr, "Reserved virtual address not aligned mod %s\n", s); fprintf(stderr, "Reserved virtual address not aligned mod %s\n", s);
g_free(s); g_free(s);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -902,7 +904,7 @@ int main(int argc, char **argv, char **envp)
* If we're in a chroot with no /proc, fall back to 1 page. * If we're in a chroot with no /proc, fall back to 1 page.
*/ */
if (mmap_min_addr == 0) { if (mmap_min_addr == 0) {
mmap_min_addr = qemu_host_page_size; mmap_min_addr = qemu_real_host_page_size();
qemu_log_mask(CPU_LOG_PAGE, qemu_log_mask(CPU_LOG_PAGE,
"host mmap_min_addr=0x%lx (fallback)\n", "host mmap_min_addr=0x%lx (fallback)\n",
mmap_min_addr); mmap_min_addr);