diff mbox series

[2/9] linux-user: Rename max_reserved_va in main

Message ID 20230306021307.1879483-3-richard.henderson@linaro.org
State New
Headers show
Series accel/tcg: Fix page_set_flags and related [#1528] | expand

Commit Message

Richard Henderson March 6, 2023, 2:13 a.m. UTC 
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(-)

Comments

Philippe Mathieu-Daudé March 6, 2023, 7:33 a.m. UTC | #1 
On 6/3/23 03:13, Richard Henderson wrote:
> 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(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff mbox series

Patch

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;
     }
 
     {