From patchwork Fri Aug 3 22:40:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 175059 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 25B5B2C0080 for ; Sat, 4 Aug 2012 08:42:36 +1000 (EST) Received: from localhost ([::1]:47836 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SxQZm-0002rz-9F for incoming@patchwork.ozlabs.org; Fri, 03 Aug 2012 18:42:34 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SxQYW-000834-PZ for qemu-devel@nongnu.org; Fri, 03 Aug 2012 18:41:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SxQYV-00042P-BX for qemu-devel@nongnu.org; Fri, 03 Aug 2012 18:41:16 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:34100) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SxQYV-0003zf-5a for qemu-devel@nongnu.org; Fri, 03 Aug 2012 18:41:15 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so1909568pbb.4 for ; Fri, 03 Aug 2012 15:41:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=eyAw5GCgX04h2DCkgV7VAQsbNxTGEFLoY2a96Q7ViUg=; b=OI027ieyiviBt6KBCREQTt3vm+/nquOaXv9zyGy6A9Bd5UFjWDiRG2HfOv7VFNfjo6 xpPDDyrmuSPSg1KfVLLuAfvhUbzxbiO+8QYJ3e5ycx255+/2qZfnqnry+0bgORgCUNxA Lnay47/XhhWBjUIiQOAp56+ohMrr3js0VhU4BS/SwfhvT0TcSt149l8/JTDb897h4BRc KEwCf1CyhGSCKQA4RNgStZ41DRQwnYodDzRbOsQ0n4ViRG5gnWpOMQ4kk3CfEIv+XE6i BKPrFFdbv5ugEk5dFhQNkbNt5MIsAypkB8u+H0+8ngbIzgbJrJOpURSd59bxnQnjGM7s aYuw== Received: by 10.66.73.133 with SMTP id l5mr1729317pav.74.1344033674805; Fri, 03 Aug 2012 15:41:14 -0700 (PDT) Received: from anchor.twiddle.home ([173.160.232.49]) by mx.google.com with ESMTPS id qd2sm3721626pbb.29.2012.08.03.15.41.13 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 03 Aug 2012 15:41:14 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 3 Aug 2012 15:40:56 -0700 Message-Id: <1344033657-9135-10-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1344033657-9135-1-git-send-email-rth@twiddle.net> References: <1344033657-9135-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.160.45 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. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- 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..ac2b6e2 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 07823e1..0d3fff5 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;