From patchwork Wed Jan 16 16:28:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 212817 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 BD3CA2C008D for ; Thu, 17 Jan 2013 03:48:57 +1100 (EST) Received: from localhost ([::1]:42428 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVrk-0006tX-66 for incoming@patchwork.ozlabs.org; Wed, 16 Jan 2013 11:29:28 -0500 Received: from eggs.gnu.org ([208.118.235.92]:42220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVrR-0006bs-Ti for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:29:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvVrN-0007tk-IF for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:29:09 -0500 Received: from mail-pb0-f46.google.com ([209.85.160.46]:38846) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVrN-0007tb-2G for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:29:05 -0500 Received: by mail-pb0-f46.google.com with SMTP id wy7so806045pbc.5 for ; Wed, 16 Jan 2013 08:29:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=kOfjG+e/97FJK/iH6UuUC1VFeE1ORjJn2dkw2PW1fiM=; b=cyuzEP4G8NF4AhFUKhrUPiLOz0DV8Ig+QBpdqBpmY3Wesg7Z8a+be06H+8D7mCY85R rcnfqmAOq3aPYA0vezopDZRS9nW2PZN+k0X9tMtQEB9NiQPem6tnYf/EQD05Jevu2CxM 7nFMkRsYL/hfq/jBPxbvk9aRDrNpdlyG22lso64Ck+DVCrnBrvQsHuShhJDCcN9oStLp xwM8EZnoD4Njh0uYX5EGUSFp98tWzD2su9JIgVuypIU+ccyyMvcp9floRcZVYaa3DlZC uioxINrv+agpBTeUipNrQeTHj1RxbrlACUjk+14YJcR83JOF/XTVQL0KhR1TPFsCAvjr +Ggg== X-Received: by 10.66.84.3 with SMTP id u3mr5002310pay.51.1358353744290; Wed, 16 Jan 2013 08:29:04 -0800 (PST) Received: from anchor.twiddle.home (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPS id t7sm13258656pax.17.2013.01.16.08.29.02 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 16 Jan 2013 08:29:03 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 16 Jan 2013 08:28:56 -0800 Message-Id: <1358353736-15310-3-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1358353736-15310-1-git-send-email-rth@twiddle.net> References: <1358353736-15310-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.160.46 Cc: Laurent Vivier Subject: [Qemu-devel] [PATCH 2/2] alpha-linux-user: 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 From: Laurent Vivier Alpha, like s390x, passes all select arguments in registers. Signed-off-by: Laurent Vivier Signed-off-by: Richard Henderson --- 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