[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 33/37] linux-user/syscall.c: handle FUTEX_WAIT_BITSE
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH 33/37] linux-user/syscall.c: handle FUTEX_WAIT_BITSET in do_futex |
Date: |
Tue, 2 Apr 2013 16:45:38 -0500 |
From: John Rigby <address@hidden>
Upstream libc has recently changed to start using
FUTEX_WAIT_BITSET instead of FUTEX_WAIT and this
is causing do_futex to return -TARGET_ENOSYS.
Pass bitset in val3 to sys_futex which will be
ignored by kernel for the FUTEX_WAIT case.
Signed-off-by: John Rigby <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
(cherry picked from commit cce246e0a21577bb2372ab3a7d6789371e087de9)
Signed-off-by: Michael Roth <address@hidden>
---
linux-user/syscall.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 9e31ea7..7bc5ba9 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -4920,6 +4920,7 @@ static int do_futex(target_ulong uaddr, int op, int val,
target_ulong timeout,
#endif
switch (base_op) {
case FUTEX_WAIT:
+ case FUTEX_WAIT_BITSET:
if (timeout) {
pts = &ts;
target_to_host_timespec(pts, timeout);
@@ -4927,7 +4928,7 @@ static int do_futex(target_ulong uaddr, int op, int val,
target_ulong timeout,
pts = NULL;
}
return get_errno(sys_futex(g2h(uaddr), op, tswap32(val),
- pts, NULL, 0));
+ pts, NULL, val3));
case FUTEX_WAKE:
return get_errno(sys_futex(g2h(uaddr), op, val, NULL, NULL, 0));
case FUTEX_FD:
--
1.7.9.5
- [Qemu-devel] [PATCH 37/37] update seabios to 1.7.2.1, (continued)
- [Qemu-devel] [PATCH 31/37] qcow2: flush refcount cache correctly in alloc_refcount_block(), Michael Roth, 2013/04/02
- [Qemu-devel] [PATCH 30/37] page_cache: fix memory leak, Michael Roth, 2013/04/02
- [Qemu-devel] [PATCH 32/37] qcow2: flush refcount cache correctly in qcow2_write_snapshots(), Michael Roth, 2013/04/02
- [Qemu-devel] [PATCH 29/37] Fix page_cache leak in cache_resize, Michael Roth, 2013/04/02
- [Qemu-devel] [PATCH 33/37] linux-user/syscall.c: handle FUTEX_WAIT_BITSET in do_futex,
Michael Roth <=
- Re: [Qemu-devel] Patch Round-up for stable 1.4.1, freeze next Tuesday, Aurelien Jarno, 2013/04/03
- Re: [Qemu-devel] [Qemu-stable] Patch Round-up for stable 1.4.1, freeze next Tuesday, Bruce Rogers, 2013/04/03
- Re: [Qemu-devel] Patch Round-up for stable 1.4.1, freeze next Tuesday, Cole Robinson, 2013/04/03
- Re: [Qemu-devel] Patch Round-up for stable 1.4.1, freeze next Tuesday, Peter Lieven, 2013/04/04
- Re: [Qemu-devel] Patch Round-up for stable 1.4.1, freeze next Tuesday, Paolo Bonzini, 2013/04/04
- Re: [Qemu-devel] Patch Round-up for stable 1.4.1, freeze next Tuesday, mdroth, 2013/04/05