aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2007-12-11 23:23:52 +0000
committerbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2007-12-11 23:23:52 +0000
commited494d87f7baf56742d5b699012e3f26e3779e10 (patch)
treeaf49c3ba7fc4ee68ba0f4f355f0480bb03d0b696
parent0486e8a71462430438a1ac593db0ffe0fb38b9a8 (diff)
downloadqemu-ed494d87f7baf56742d5b699012e3f26e3779e10.zip
qemu-ed494d87f7baf56742d5b699012e3f26e3779e10.tar.gz
qemu-ed494d87f7baf56742d5b699012e3f26e3779e10.tar.bz2
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
-rw-r--r--linux-user/syscall.c1
-rw-r--r--vl.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 0deb041..1062fdf 100644
--- 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 9cb81ce..e88b2a4 100644
--- 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++) {