From mboxrd@z Thu Jan 1 00:00:00 1970 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) Sender: Richard Henderson From: Richard Henderson Date: Fri, 3 Aug 2012 15:40:56 -0700 Message-Id: <1344033657-9135-10-git-send-email-rth@twiddle.net> In-Reply-To: <1344033657-9135-1-git-send-email-rth@twiddle.net> References: <1344033657-9135-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 09/10] alpha-linux-user: Properly handle the non-rt sigprocmask syscall. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@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; -- 1.7.7.6