From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tqh9f-0006dO-04 for qemu-devel@nongnu.org; Thu, 03 Jan 2013 04:32:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tqh9c-0008Rf-72 for qemu-devel@nongnu.org; Thu, 03 Jan 2013 04:32:02 -0500 Received: from outgoing.csail.mit.edu ([128.30.2.149]:48733) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tqh9c-0008RU-3o for qemu-devel@nongnu.org; Thu, 03 Jan 2013 04:32:00 -0500 From: Nickolai Zeldovich Date: Thu, 3 Jan 2013 04:32:20 -0500 Message-Id: <1357205540-20597-1-git-send-email-nickolai@csail.mit.edu> Subject: [Qemu-devel] [PATCH] linux-user/syscall.c: fix select on x86_64 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Nickolai Zeldovich , Riku Voipio Use the correct argument passing convention for select on x86_64. Previously, select worked for i386 but was broken for x86_64 (always returning EINVAL). With this change, select works on both i386 and x86_64. (Other targets untested but should be unaffected.) Signed-off-by: Nickolai Zeldovich --- linux-user/syscall.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index e99adab..5a81d9f 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6213,7 +6213,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, ret = get_errno(settimeofday(&tv, NULL)); } break; -#if defined(TARGET_NR_select) && !defined(TARGET_S390X) && !defined(TARGET_S390) +#if defined(TARGET_NR_select) && !defined(TARGET_S390X) \ + && !defined(TARGET_S390) && !defined(TARGET_X86_64) case TARGET_NR_select: { struct target_sel_arg_struct *sel; @@ -7153,8 +7154,9 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, } break; #endif /* TARGET_NR_getdents64 */ -#if defined(TARGET_NR__newselect) || defined(TARGET_S390X) -#ifdef TARGET_S390X +#if defined(TARGET_NR__newselect) || defined(TARGET_S390X) \ + || defined(TARGET_X86_64) +#if defined(TARGET_S390X) || defined(TARGET_X86_64) case TARGET_NR_select: #else case TARGET_NR__newselect: -- 1.7.10.4