From 3a93113a002db694657fcf24ff0c96aef83303b8 Mon Sep 17 00:00:00 2001 From: Dong Xu Wang Date: Tue, 29 Nov 2011 16:52:38 +0800 Subject: fix typo: delete redundant semicolon Double semicolons should be single. Signed-off-by: Dong Xu Wang Signed-off-by: Stefan Hajnoczi --- linux-user/syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linux-user/syscall.c') diff --git a/linux-user/syscall.c b/linux-user/syscall.c index f227097801..c84cc65f7a 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -2377,7 +2377,7 @@ static inline abi_long host_to_target_semid_ds(abi_ulong target_addr, if (!lock_user_struct(VERIFY_WRITE, target_sd, target_addr, 0)) return -TARGET_EFAULT; if (host_to_target_ipc_perm(target_addr,&(host_sd->sem_perm))) - return -TARGET_EFAULT;; + return -TARGET_EFAULT; target_sd->sem_nsems = tswapal(host_sd->sem_nsems); target_sd->sem_otime = tswapal(host_sd->sem_otime); target_sd->sem_ctime = tswapal(host_sd->sem_ctime); -- cgit 1.4.1 From 31b631936376042a503b5378d9716137b170b758 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Mon, 5 Dec 2011 23:11:50 +0000 Subject: linux-user/syscall.c: Don't skip stracing for fcntl64 failure case In an fcntl64 failure path, we were returning directly rather than simply breaking out of the switch statement. This skips the strace code for printing the syscall return value, so don't do that. Acked-by: Alexander Graf Signed-off-by: Peter Maydell Signed-off-by: Stefan Hajnoczi --- linux-user/syscall.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'linux-user/syscall.c') diff --git a/linux-user/syscall.c b/linux-user/syscall.c index c84cc65f7a..2bf9e7ec44 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -7521,8 +7521,10 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, #endif cmd = target_to_host_fcntl_cmd(arg2); - if (cmd == -TARGET_EINVAL) - return cmd; + if (cmd == -TARGET_EINVAL) { + ret = cmd; + break; + } switch(arg2) { case TARGET_F_GETLK64: -- cgit 1.4.1