summaryrefslogtreecommitdiff
path: root/linux-user
diff options
context:
space:
mode:
authorPetar Jovanovic <petar.jovanovic@imgtec.com>2013-03-21 07:57:36 +0000
committerRiku Voipio <riku.voipio@linaro.org>2013-04-19 10:48:51 +0300
commitc7128c9fd58ee92cae70c7cd1d53acc529cebbbb (patch)
tree603656b9b371f6cc9a063368a32529f1fbd7616c /linux-user
parent09dada400328d75daf79e3eca1e48e024fec148d (diff)
downloadqemu-c7128c9fd58ee92cae70c7cd1d53acc529cebbbb.tar.gz
qemu-c7128c9fd58ee92cae70c7cd1d53acc529cebbbb.tar.bz2
qemu-c7128c9fd58ee92cae70c7cd1d53acc529cebbbb.zip
linux-user: change do_semop to return target errno when unsuccessful
do_semop() is called from two places, and one of these fails to convert return error to target errno when semop fails. This patch changes the function to always return target errno in case of an unsuccessful call. Signed-off-by: Petar Jovanovic <petar.jovanovic@imgtec.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Diffstat (limited to 'linux-user')
-rw-r--r--linux-user/syscall.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 1f07621ffe..d6d20502ed 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -2764,7 +2764,7 @@ static inline abi_long do_semop(int semid, abi_long ptr, unsigned nsops)
if (target_to_host_sembuf(sops, ptr, nsops))
return -TARGET_EFAULT;
- return semop(semid, sops, nsops);
+ return get_errno(semop(semid, sops, nsops));
}
struct target_msqid_ds
@@ -6957,7 +6957,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
#endif
#ifdef TARGET_NR_semop
case TARGET_NR_semop:
- ret = get_errno(do_semop(arg1, arg2, arg3));
+ ret = do_semop(arg1, arg2, arg3);
break;
#endif
#ifdef TARGET_NR_semctl