From patchwork Wed Jul 25 22:10:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 173301 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 8C4302C0091 for ; Thu, 26 Jul 2012 08:49:50 +1000 (EST) Received: from localhost ([::1]:53715 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Su9oF-0001vC-VH for incoming@patchwork.ozlabs.org; Wed, 25 Jul 2012 18:11:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42439) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Su9nF-0007vM-5X for qemu-devel@nongnu.org; Wed, 25 Jul 2012 18:10:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Su9nE-000144-3b for qemu-devel@nongnu.org; Wed, 25 Jul 2012 18:10:57 -0400 Received: from mail-gg0-f173.google.com ([209.85.161.173]:39814) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Su9nD-00013w-VJ for qemu-devel@nongnu.org; Wed, 25 Jul 2012 18:10:56 -0400 Received: by ggnp1 with SMTP id p1so1266901ggn.4 for ; Wed, 25 Jul 2012 15:10:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=/rxALNwkKi1lEA6wXtM6Y0IT3jSV5oUz8HowxrhT5+k=; b=GO5Ucl7jYBs6LIab++Fd40tcnKvrFszKZW/U11gFEDGGY1q2m9aBYVQrLEMZzvWKDy s3ibOGbLoedWfJtazkpZ0SK/xK98EVDVVUmqRorIGZaptc306foL4uFMOfKzDulfzvPq SQ49aBfbkNUVIhTpPu697AamZF5Xz6imbq78U41bb+dS8BgIUrvYVjoPIk6aYEAuJAiM t8BCMSco1L+Cm1MzmRxFJuv7GLAaaaPCCJJcBIJHdu//eTb5ovIBmGAh4penQnY8o3q6 SJHHyp6QgulQjD5xQJiJqsH0jORJrxx1Ox41Hq+2BAIxezKDK7aXKSFYvQAjWTcmTHg2 AKdg== Received: by 10.66.74.3 with SMTP id p3mr15723599pav.49.1343254255244; Wed, 25 Jul 2012 15:10:55 -0700 (PDT) Received: from anchor.twiddle.home.com ([173.160.232.49]) by mx.google.com with ESMTPS id oo6sm15136761pbc.22.2012.07.25.15.10.54 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 25 Jul 2012 15:10:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 25 Jul 2012 15:10:37 -0700 Message-Id: <1343254238-4727-10-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1343254238-4727-1-git-send-email-rth@twiddle.net> References: <1343254238-4727-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.161.173 Cc: riku.voipio@iki.fi Subject: [Qemu-devel] [PATCH 09/10] alpha-linux-user: Properly handle the non-rt sigprocmask syscall. 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 Name the syscall properly for QEMU, kernel source notwithstanding. Fix syntax errors in the code thus enabled within do_syscall. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- linux-user/alpha/syscall_nr.h | 2 +- linux-user/syscall.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/linux-user/alpha/syscall_nr.h b/linux-user/alpha/syscall_nr.h index f6284db..49648a1 100644 --- a/linux-user/alpha/syscall_nr.h +++ b/linux-user/alpha/syscall_nr.h @@ -46,7 +46,7 @@ #define TARGET_NR_open 45 #define TARGET_NR_osf_old_sigaction 46 /* not implemented */ #define TARGET_NR_getxgid 47 -#define TARGET_NR_osf_sigprocmask 48 +#define TARGET_NR_sigprocmask 48 #define TARGET_NR_osf_getlogin 49 /* not implemented */ #define TARGET_NR_osf_setlogin 50 /* not implemented */ #define TARGET_NR_acct 51 diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 1a12f14..2e1c1c0 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -5881,11 +5881,10 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, target_to_host_old_sigset(&set, &mask); ret = get_errno(sigprocmask(how, &set, &oldset)); - if (!is_error(ret)) { host_to_target_old_sigset(&mask, &oldset); ret = mask; - ((CPUAlphaState *)cpu_env)->[IR_V0] = 0; /* force no error */ + ((CPUAlphaState *)cpu_env)->ir[IR_V0] = 0; /* force no error */ } #else sigset_t set, oldset, *set_ptr;