[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/9] linux-user: Rename max_reserved_va in main
From: |
Richard Henderson |
Subject: |
[PATCH 2/9] linux-user: Rename max_reserved_va in main |
Date: |
Sun, 5 Mar 2023 18:13:00 -0800 |
Rename to local_max_va, to avoid a conflict with the next patch.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/main.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/linux-user/main.c b/linux-user/main.c
index f4dea25242..5fcaddffc2 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -680,7 +680,7 @@ int main(int argc, char **argv, char **envp)
int i;
int ret;
int execfd;
- unsigned long max_reserved_va;
+ unsigned long local_max_va;
bool preserve_argv0;
error_init(argv[0]);
@@ -786,9 +786,9 @@ int main(int argc, char **argv, char **envp)
* still try it, if directed by the command-line option, but
* not by default.
*/
- max_reserved_va = MAX_RESERVED_VA(cpu);
+ local_max_va = MAX_RESERVED_VA(cpu);
if (reserved_va != 0) {
- if (max_reserved_va && reserved_va > max_reserved_va) {
+ if (local_max_va && reserved_va > local_max_va) {
fprintf(stderr, "Reserved virtual address too big\n");
exit(EXIT_FAILURE);
}
@@ -797,7 +797,7 @@ int main(int argc, char **argv, char **envp)
* reserved_va must be aligned with the host page size
* as it is used with mmap()
*/
- reserved_va = max_reserved_va & qemu_host_page_mask;
+ reserved_va = local_max_va & qemu_host_page_mask;
}
{
--
2.34.1
- [PATCH 0/9] accel/tcg: Fix page_set_flags and related [#1528], Richard Henderson, 2023/03/05
- [PATCH 1/9] linux-user: Diagnose incorrect -R size, Richard Henderson, 2023/03/05
- Re: [PATCH 1/9] linux-user: Diagnose incorrect -R size, Peter Maydell, 2023/03/06
- Re: [PATCH 1/9] linux-user: Diagnose incorrect -R size, Richard Henderson, 2023/03/06
- Re: [PATCH 1/9] linux-user: Diagnose incorrect -R size, Peter Maydell, 2023/03/07
- Re: [PATCH 1/9] linux-user: Diagnose incorrect -R size, Peter Maydell, 2023/03/07
- Re: [PATCH 1/9] linux-user: Diagnose incorrect -R size, Richard Henderson, 2023/03/17
- Re: [PATCH 1/9] linux-user: Diagnose incorrect -R size, Peter Maydell, 2023/03/17
- Re: [PATCH 1/9] linux-user: Diagnose incorrect -R size, Peter Maydell, 2023/03/17
[PATCH 2/9] linux-user: Rename max_reserved_va in main,
Richard Henderson <=
[PATCH 5/9] accel/tcg: Pass last not end to page_reset_target_data, Richard Henderson, 2023/03/05
[PATCH 3/9] include/exec: Replace reserved_va with max_reserved_va, Richard Henderson, 2023/03/05
[PATCH 6/9] accel/tcg: Pass last not end to PAGE_FOR_EACH_TB, Richard Henderson, 2023/03/05
[PATCH 7/9] accel/tcg: Pass last not end to page_collection_lock, Richard Henderson, 2023/03/05
[PATCH 4/9] accel/tcg: Pass last not end to page_set_flags, Richard Henderson, 2023/03/05