Commit ed494d87f7baf56742d5b699012e3f26e3779e10
1 parent
0486e8a7
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
Showing
2 changed files
with
2 additions
and
1 deletions
linux-user/syscall.c
| @@ -3178,6 +3178,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, | @@ -3178,6 +3178,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, | ||
| 3178 | ret = get_errno(sys_unlinkat(arg1, p, arg3)); | 3178 | ret = get_errno(sys_unlinkat(arg1, p, arg3)); |
| 3179 | unlock_user(p, arg2, 0); | 3179 | unlock_user(p, arg2, 0); |
| 3180 | #endif | 3180 | #endif |
| 3181 | + break; | ||
| 3181 | case TARGET_NR_execve: | 3182 | case TARGET_NR_execve: |
| 3182 | { | 3183 | { |
| 3183 | char **argp, **envp; | 3184 | char **argp, **envp; |
vl.c
| @@ -8721,7 +8721,7 @@ int main(int argc, char **argv) | @@ -8721,7 +8721,7 @@ int main(int argc, char **argv) | ||
| 8721 | } | 8721 | } |
| 8722 | 8722 | ||
| 8723 | #ifdef TARGET_I386 | 8723 | #ifdef TARGET_I386 |
| 8724 | - /* XXX: this should be moved in the PC machine instanciation code */ | 8724 | + /* XXX: this should be moved in the PC machine instantiation code */ |
| 8725 | if (net_boot != 0) { | 8725 | if (net_boot != 0) { |
| 8726 | int netroms = 0; | 8726 | int netroms = 0; |
| 8727 | for (i = 0; i < nb_nics && i < 4; i++) { | 8727 | for (i = 0; i < nb_nics && i < 4; i++) { |