gwj / at91sam9263 · Commits

Commit 98448f58c10033a0f7fcd0673cce4626506403fa

Authored by blueswir1
1 parent 223f0d72

Silence some warnings about uninitialized variables 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5362 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 3 changed files with 6 additions and 3 deletions
linux-user/elfload.c
  View file @98448f5
... ... @@ -1148,6 +1148,7 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs,
1148 1148 end_code = 0;
1149 1149 start_data = 0;
1150 1150 end_data = 0;
  1151 + interp_ex.a_info = 0;
1151 1152  
1152 1153 for(i=0;i < elf_ex.e_phnum; i++) {
1153 1154 if (elf_ppnt->p_type == PT_INTERP) {
... ...
linux-user/strace.c
  View file @98448f5
... ... @@ -178,7 +178,7 @@ print_execve(const struct syscallname *name,
178 178 unlock_user(s, arg1, 0);
179 179  
180 180 for (arg_ptr_addr = arg2; ; arg_ptr_addr += sizeof(abi_ulong)) {
181   - abi_ulong *arg_ptr, arg_addr, s_addr;
  181 + abi_ulong *arg_ptr, arg_addr;
182 182  
183 183 arg_ptr = lock_user(VERIFY_READ, arg_ptr_addr, sizeof(abi_ulong), 1);
184 184 if (!arg_ptr)
... ... @@ -189,7 +189,7 @@ print_execve(const struct syscallname *name,
189 189 break;
190 190 if ((s = lock_user_string(arg_addr))) {
191 191 gemu_log("\"%s\",", s);
192   - unlock_user(s, s_addr, 0);
  192 + unlock_user(s, arg_addr, 0);
193 193 }
194 194 }
195 195  
... ...
... ... @@ -7831,8 +7831,10 @@ static int main_loop(void)
7831 7831 timeout = 0;
7832 7832 }
7833 7833 } else {
7834   - if (shutdown_requested)
  7834 + if (shutdown_requested) {
  7835 + ret = EXCP_INTERRUPT;
7835 7836 break;
  7837 + }
7836 7838 timeout = 10;
7837 7839 }
7838 7840 #ifdef CONFIG_PROFILER
... ...