diff options
| author | Petar Jovanovic | 2013-03-21 18:57:36 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi | 2013-04-19 11:42:03 +0200 |
| commit | 40508bb424971d9f39f3fb3b455a1765aa7799ee (patch) | |
| tree | a4c955737479467d9887261b46ff371aa54f10f4 | |
| parent | w64: Fix compiler warnings (wrong format specifier) (diff) | |
| download | qemu-40508bb424971d9f39f3fb3b455a1765aa7799ee.tar.gz qemu-40508bb424971d9f39f3fb3b455a1765aa7799ee.tar.xz qemu-40508bb424971d9f39f3fb3b455a1765aa7799ee.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: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | linux-user/syscall.c | 4 |
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 |