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

linux-user: Remove HOST_PAGE_ALIGN from mmap.c

Browse Source 
This removes a hidden use of qemu_host_page_size, using instead
the existing host_page_size local within each function.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
Acked-by: Helge Deller <deller@gmx.de>
Message-Id: <20240102015808.132373-11-richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2024-01-02 12:57:45 +11:00
parent e56922abf0
commit b36b2b1d3d
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
linux-user/mmap.c
View File

@ -191,7 +191,7 @@ int target_mprotect(abi_ulong start, abi_ulong len, int target_prot)
last = start + len - 1; last = start + len - 1;
host_start = start & -host_page_size; host_start = start & -host_page_size;
host_last = HOST_PAGE_ALIGN(last) - 1; host_last = ROUND_UP(last, host_page_size) - 1;
nranges = 0; nranges = 0;
mmap_lock(); mmap_lock();
@ -389,8 +389,7 @@ abi_ulong mmap_find_vma(abi_ulong start, abi_ulong size, abi_ulong align)
start &= -host_page_size; start &= -host_page_size;
} }
start = ROUND_UP(start, align); start = ROUND_UP(start, align);
size = ROUND_UP(size, host_page_size);
size = HOST_PAGE_ALIGN(size);
if (reserved_va) { if (reserved_va) {
return mmap_find_vma_reserved(start, size, align); return mmap_find_vma_reserved(start, size, align);
@ -550,7 +549,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int target_prot,
*/ */
if (!(flags & (MAP_FIXED | MAP_FIXED_NOREPLACE))) { if (!(flags & (MAP_FIXED | MAP_FIXED_NOREPLACE))) {
host_len = len + offset - host_offset; host_len = len + offset - host_offset;
host_len = HOST_PAGE_ALIGN(host_len); host_len = ROUND_UP(host_len, host_page_size);
start = mmap_find_vma(real_start, host_len, TARGET_PAGE_SIZE); start = mmap_find_vma(real_start, host_len, TARGET_PAGE_SIZE);
if (start == (abi_ulong)-1) { if (start == (abi_ulong)-1) {
errno = ENOMEM; errno = ENOMEM;
@ -595,7 +594,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int target_prot,
void *p; void *p;
host_len = len + offset - host_offset; host_len = len + offset - host_offset;
host_len = HOST_PAGE_ALIGN(host_len); host_len = ROUND_UP(host_len, host_page_size);
host_prot = target_to_host_prot(target_prot); host_prot = target_to_host_prot(target_prot);
/* Note: we prefer to control the mapping address. */ /* Note: we prefer to control the mapping address. */
@ -625,7 +624,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int target_prot,
goto fail; goto fail;
} }
last = start + len - 1; last = start + len - 1;
real_last = HOST_PAGE_ALIGN(last) - 1; real_last = ROUND_UP(last, host_page_size) - 1;
/* /*
* Test if requested memory area fits target address space * Test if requested memory area fits target address space
@ -794,7 +793,7 @@ static int mmap_reserve_or_unmap(abi_ulong start, abi_ulong len)
last = start + len - 1; last = start + len - 1;
real_start = start & -host_page_size; real_start = start & -host_page_size;
real_last = HOST_PAGE_ALIGN(last) - 1; real_last = ROUND_UP(last, host_page_size) - 1;
/* /*
* If guest pages remain on the first or last host pages, * If guest pages remain on the first or last host pages,