From patchwork Thu Jan 10 21:30:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 211157 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BCAEB2C00DC for ; Fri, 11 Jan 2013 08:31:11 +1100 (EST) Received: from localhost ([::1]:43936 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtPiP-0007DA-Je for incoming@patchwork.ozlabs.org; Thu, 10 Jan 2013 16:31:09 -0500 Received: from eggs.gnu.org ([208.118.235.92]:34541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtPiI-0007Cu-14 for qemu-devel@nongnu.org; Thu, 10 Jan 2013 16:31:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TtPiG-0006Hv-Aw for qemu-devel@nongnu.org; Thu, 10 Jan 2013 16:31:01 -0500 Received: from smtp6-g21.free.fr ([2a01:e0c:1:1599::15]:60643) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtPiF-0006Hl-Na for qemu-devel@nongnu.org; Thu, 10 Jan 2013 16:31:00 -0500 Received: from localhost.localdomain (unknown [78.238.229.36]) by smtp6-g21.free.fr (Postfix) with ESMTP id 5FA1482242; Thu, 10 Jan 2013 22:30:53 +0100 (CET) From: Laurent Vivier To: Richard Henderson Date: Thu, 10 Jan 2013 22:30:50 +0100 Message-Id: <1357853450-10445-1-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1357598314-21156-1-git-send-email-laurent@vivier.eu> References: <1357598314-21156-1-git-send-email-laurent@vivier.eu> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a01:e0c:1:1599::15 Cc: Riku Voipio , qemu-devel@nongnu.org, Laurent Vivier Subject: [Qemu-devel] [PATCH][v2] linux-user,alpha: correct select() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- v2: remove unused TARGET_S390 and simplify ifdefs linux-user/syscall.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 94f79dd..693e66f 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6227,8 +6227,11 @@ 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) case TARGET_NR_select: +#if defined(TARGET_S390X) || defined(TARGET_ALPHA) + ret = do_select(arg1, arg2, arg3, arg4, arg5); +#else { struct target_sel_arg_struct *sel; abi_ulong inp, outp, exp, tvp; @@ -6244,6 +6247,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, unlock_user_struct(sel, arg1, 0); ret = do_select(nsel, inp, outp, exp, tvp); } +#endif break; #endif #ifdef TARGET_NR_pselect6 @@ -7167,12 +7171,8 @@ 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 - case TARGET_NR_select: -#else +#if defined(TARGET_NR__newselect) case TARGET_NR__newselect: -#endif ret = do_select(arg1, arg2, arg3, arg4, arg5); break; #endif