motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 18:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

linux-user/nios2: Remove qemu_host_page_size from init_guest_commpage

Browse source 
Use qemu_real_host_page_size.
If !reserved_va, use MAP_FIXED_NOREPLACE.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Acked-by: Helge Deller <deller@gmx.de>
Message-Id: <20240102015808.132373-7-richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2024-01-02 12:57:41 +11:00
parent d1fc62303e
commit 51f8c9b872
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
linux-user/elfload.c
View file

@ -1532,10 +1532,14 @@ static bool init_guest_commpage(void)
0x3a, 0x68, 0x3b, 0x00, /* trap 0 */ 0x3a, 0x68, 0x3b, 0x00, /* trap 0 */
}; };
void *want = g2h_untagged(LO_COMMPAGE & -qemu_host_page_size); int host_page_size = qemu_real_host_page_size();
void *addr = mmap(want, qemu_host_page_size, PROT_READ | PROT_WRITE, void *want, *addr;
MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED, -1, 0);
want = g2h_untagged(LO_COMMPAGE & -host_page_size);
addr = mmap(want, host_page_size, PROT_READ | PROT_WRITE,
MAP_ANONYMOUS | MAP_PRIVATE |
(reserved_va ? MAP_FIXED : MAP_FIXED_NOREPLACE),
-1, 0);
if (addr == MAP_FAILED) { if (addr == MAP_FAILED) {
perror("Allocating guest commpage"); perror("Allocating guest commpage");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -1544,9 +1548,9 @@ static bool init_guest_commpage(void)
return false; return false;
} }
memcpy(addr, kuser_page, sizeof(kuser_page)); memcpy(g2h_untagged(LO_COMMPAGE), kuser_page, sizeof(kuser_page));
if (mprotect(addr, qemu_host_page_size, PROT_READ)) { if (mprotect(addr, host_page_size, PROT_READ)) {
perror("Protecting guest commpage"); perror("Protecting guest commpage");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }