diff options
| author | Anthony Liguori | 2013-04-19 15:38:16 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-04-19 15:38:16 +0200 |
| commit | f691df528340807d42247fe79a89ea88e6303e1d (patch) | |
| tree | a7d723e846a4754e994026e08d7609c3ea6d3f6f /linux-user/syscall.c | |
| parent | Merge remote-tracking branch 'mst/tags/for_anthony' into staging (diff) | |
| parent | m25p80: Remove bogus include of devices.h (diff) | |
| download | qemu-f691df528340807d42247fe79a89ea88e6303e1d.tar.gz qemu-f691df528340807d42247fe79a89ea88e6303e1d.tar.xz qemu-f691df528340807d42247fe79a89ea88e6303e1d.zip | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
# By Stefan Weil (3) and others
# Via Stefan Hajnoczi
* stefanha/trivial-patches:
m25p80: Remove bogus include of devices.h
ssh: Remove unnecessary use of strlen function.
block/ssh: Add missing gcc format attributes
linux-user: change do_semop to return target errno when unsuccessful
w64: Fix compiler warnings (wrong format specifier)
Remove unneeded type casts
virtio.h: drop unused function prototypes
bswap: fix compiler warning
Message-id: 1366371241-23430-1-git-send-email-stefanha@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'linux-user/syscall.c')
| -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 |