ui: Always remove an old VNC channel watch before adding a new one

[qemu.git] / bsd-user / elfload.c

diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c
index 41a1309296c34e2c8036f1690aaad4e44e41856e..7cccf3eb8baf14f9bdc28cb39e0e308e5cc896a8 100644 (file)
--- a/bsd-user/elfload.c
+++ b/bsd-user/elfload.c
@@ -1155,21 +1155,20 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs,
     unsigned int interpreter_type = INTERPRETER_NONE;
     unsigned char ibcs2_interpreter;
     int i;
     unsigned int interpreter_type = INTERPRETER_NONE;
     unsigned char ibcs2_interpreter;
     int i;

-    abi_ulong mapped_addr;

     struct elf_phdr * elf_ppnt;
     struct elf_phdr *elf_phdata;
     abi_ulong elf_bss, k, elf_brk;
     int retval;
     char * elf_interpreter;
     abi_ulong elf_entry, interp_load_addr = 0;
     struct elf_phdr * elf_ppnt;
     struct elf_phdr *elf_phdata;
     abi_ulong elf_bss, k, elf_brk;
     int retval;
     char * elf_interpreter;
     abi_ulong elf_entry, interp_load_addr = 0;

-    int status;

     abi_ulong start_code, end_code, start_data, end_data;
     abi_ulong reloc_func_desc = 0;
     abi_ulong start_code, end_code, start_data, end_data;
     abi_ulong reloc_func_desc = 0;

-    abi_ulong elf_stack;
+#ifdef LOW_ELF_STACK
+    abi_ulong elf_stack = ~((abi_ulong)0UL);
+#endif

     char passed_fileno[6];
 
     ibcs2_interpreter = 0;
     char passed_fileno[6];
 
     ibcs2_interpreter = 0;

-    status = 0;

     load_addr = 0;
     load_bias = 0;
     elf_ex = *((struct elfhdr *) bprm->buf);          /* exec-header */
     load_addr = 0;
     load_bias = 0;
     elf_ex = *((struct elfhdr *) bprm->buf);          /* exec-header */


@@ -1221,7 +1220,6 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs,
     elf_brk = 0;
 
 
     elf_brk = 0;
 
 

-    elf_stack = ~((abi_ulong)0UL);

     elf_interpreter = NULL;
     start_code = ~((abi_ulong)0UL);
     end_code = 0;
     elf_interpreter = NULL;
     start_code = ~((abi_ulong)0UL);
     end_code = 0;


@@ -1546,7 +1544,7 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs,
                and some applications "depend" upon this behavior.
                Since we do not have the power to recompile these, we
                emulate the SVr4 behavior.  Sigh.  */
                and some applications "depend" upon this behavior.
                Since we do not have the power to recompile these, we
                emulate the SVr4 behavior.  Sigh.  */

-            mapped_addr = target_mmap(0, qemu_host_page_size, PROT_READ | PROT_EXEC,
+            target_mmap(0, qemu_host_page_size, PROT_READ | PROT_EXEC,

                                       MAP_FIXED | MAP_PRIVATE, -1, 0);
     }
 
                                       MAP_FIXED | MAP_PRIVATE, -1, 0);
     }