[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 2/9] linux-user: Rename max_reserved_va in main
From: |
Richard Henderson |
Subject: |
[PATCH v2 2/9] linux-user: Rename max_reserved_va in main |
Date: |
Fri, 17 Mar 2023 08:54:48 -0700 |
Rename to local_max_rva, to avoid a conflict with the next patch.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
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 39d9bd4d7a..165fcb653e 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_rva;
bool preserve_argv0;
error_init(argv[0]);
@@ -791,7 +791,7 @@ 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_rva = MAX_RESERVED_VA(cpu);
if (reserved_va != 0) {
if (reserved_va % qemu_host_page_size) {
char *s = size_to_str(qemu_host_page_size);
@@ -799,7 +799,7 @@ int main(int argc, char **argv, char **envp)
g_free(s);
exit(EXIT_FAILURE);
}
- if (max_reserved_va && reserved_va > max_reserved_va) {
+ if (local_max_rva && reserved_va > local_max_rva) {
fprintf(stderr, "Reserved virtual address too big\n");
exit(EXIT_FAILURE);
}
@@ -808,7 +808,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_rva & qemu_host_page_mask;
}
{
--
2.34.1
- [PATCH v2 0/9] accel/tcg: Fix page_set_flags and related [#1528], Richard Henderson, 2023/03/17
- [PATCH v2 1/9] linux-user: Diagnose misaligned -R size, Richard Henderson, 2023/03/17
- [PATCH v2 2/9] linux-user: Rename max_reserved_va in main,
Richard Henderson <=
- [PATCH v2 3/9] include/exec: Replace reserved_va with max_reserved_va, Richard Henderson, 2023/03/17
- [PATCH v2 4/9] accel/tcg: Pass last not end to page_set_flags, Richard Henderson, 2023/03/17
- [PATCH v2 5/9] accel/tcg: Pass last not end to page_reset_target_data, Richard Henderson, 2023/03/17
- [PATCH v2 6/9] accel/tcg: Pass last not end to PAGE_FOR_EACH_TB, Richard Henderson, 2023/03/17
- [PATCH v2 7/9] accel/tcg: Pass last not end to page_collection_lock, Richard Henderson, 2023/03/17
- [PATCH v2 8/9] accel/tcg: Pass last not end to tb_invalidate_phys_page_range__locked, Richard Henderson, 2023/03/17
- [PATCH v2 9/9] accel/tcg: Pass last not end to tb_invalidate_phys_range, Richard Henderson, 2023/03/17