Add missing break just before execve, by Takashi Yoshii.

Fix a comment typo.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3810 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 0deb041edacede186845e28e2e210f987a51fee5..1062fdf03e90e9720c8104fa44bc4f12753ffb86 100644 (file)
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -3178,6 +3178,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
         ret = get_errno(sys_unlinkat(arg1, p, arg3));
         unlock_user(p, arg2, 0);
 #endif
+        break;
     case TARGET_NR_execve:
         {
             char **argp, **envp;

diff --git a/vl.c b/vl.c
index 9cb81ce47cd288f81d1f664f2b494e3496ab3d6c..e88b2a4c3b8b0495c75bc9cb9ea7f32d9522700b 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -8721,7 +8721,7 @@ int main(int argc, char **argv)
     }
 
 #ifdef TARGET_I386
-    /* XXX: this should be moved in the PC machine instanciation code */
+    /* XXX: this should be moved in the PC machine instantiation code */
     if (net_boot != 0) {
         int netroms = 0;
        for (i = 0; i < nb_nics && i < 4; i++) {