[Qemu-devel] [5362] Silence some warnings about uninitialized variables

[Blue Swirl]

Revision: 5362
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5362
Author:   blueswir1
Date:     2008-09-30 18:16:09 +0000 (Tue, 30 Sep 2008)

Log Message:
-----------
Silence some warnings about uninitialized variables

Modified Paths:
--------------
    trunk/linux-user/elfload.c
    trunk/linux-user/strace.c
    trunk/vl.c

Modified: trunk/linux-user/elfload.c
===================================================================
--- trunk/linux-user/elfload.c  2008-09-30 18:12:18 UTC (rev 5361)
+++ trunk/linux-user/elfload.c  2008-09-30 18:16:09 UTC (rev 5362)
@@ -1148,6 +1148,7 @@
     end_code = 0;
     start_data = 0;
     end_data = 0;
+    interp_ex.a_info = 0;
 
     for(i=0;i < elf_ex.e_phnum; i++) {
        if (elf_ppnt->p_type == PT_INTERP) {

Modified: trunk/linux-user/strace.c
===================================================================
--- trunk/linux-user/strace.c   2008-09-30 18:12:18 UTC (rev 5361)
+++ trunk/linux-user/strace.c   2008-09-30 18:16:09 UTC (rev 5362)
@@ -178,7 +178,7 @@
     unlock_user(s, arg1, 0);
 
     for (arg_ptr_addr = arg2; ; arg_ptr_addr += sizeof(abi_ulong)) {
-        abi_ulong *arg_ptr, arg_addr, s_addr;
+        abi_ulong *arg_ptr, arg_addr;
 
        arg_ptr = lock_user(VERIFY_READ, arg_ptr_addr, sizeof(abi_ulong), 1);
         if (!arg_ptr)
@@ -189,7 +189,7 @@
             break;
         if ((s = lock_user_string(arg_addr))) {
             gemu_log("\"%s\",", s);
-            unlock_user(s, s_addr, 0);
+            unlock_user(s, arg_addr, 0);
         }
     }
 

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c  2008-09-30 18:12:18 UTC (rev 5361)
+++ trunk/vl.c  2008-09-30 18:16:09 UTC (rev 5362)
@@ -7831,8 +7831,10 @@
                 timeout = 0;
             }
         } else {
-            if (shutdown_requested)
+            if (shutdown_requested) {
+                ret = EXCP_INTERRUPT;
                 break;
+            }
             timeout = 10;
         }
 #ifdef CONFIG_PROFILER