From patchwork Fri Jan 18 21:31:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 156069 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3739889jaa; Fri, 18 Jan 2019 13:50:05 -0800 (PST) X-Google-Smtp-Source: ALg8bN6RmcMCLXN0iBhXJ+bMwOCyxX3Jti6UipsKR076+pRvwk1Nl3/A+jWIu8KdDCHHEx5f3zlq X-Received: by 2002:a5d:4652:: with SMTP id j18mr18700626wrs.279.1547848205425; Fri, 18 Jan 2019 13:50:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547848205; cv=none; d=google.com; s=arc-20160816; b=kHjSBv8q3y6r/kUYuEUIM2++5Qg9GL8yV8C0T/eQ903sw7ZrXBIyuD1jiximSQD7op 5Jo9aHHtLDfqmFyGj3/0rn+cah+ID5uZUBfKmTMP0BL0usq7WBaD+w7ghZWHolcvbvas zZ2nGW37ammPgKNjwmYz7qKwynViTvE8BqlbnSkw7nM4jwx1fxMPbQfzkaCrb9Or8rIA 74YGI1tJHPqOqNgJeYDNODtsrGwfR5CchbvAXIXZTE6iM1YtfJHpAHKUZ3khm2yfnAj2 rnzlfQohs10dPrR3XYMj/Oi2xYRl3OxO5BtEYarnu0qqz/JckNR4fn/E1ULaiwjwjxAb XD2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=mMLXq3y5oDzTH+FS6gxmVbqTOM9CfvVIfIxHklj9DEE=; b=J00O+sE0gg2fNZJGs//qmdITJaxTo4PEL/dodTJp7vNNhYRWdE2MT6da3OZc6y49LW zwG4sfw80lscOZY4mJfBzSivFI0aOCcyM0S2ntH6zwzVVQgTO8IAWYpjKHl6JT/6cjuu F4ZpdvGgNu0xk+8mTChAf6579dSJirdea6iDzqzYt3ycRGkTh+0YDgVbwXfsnwjUnvQ3 xMUflv12f1J4bchIHyHODsJynFJWZqZvTFdu2b3KDXbtw2/xVxnxB4VvOKrQ2wno41nI hdDEuaUmTVVgjxtBT9IRxCThhh/hxI6uhXQmq2f3yNvj6PHqK4HaaqW+OPv0Lj3suVLC FWkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ECsFVkky; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h11si59924890wri.367.2019.01.18.13.50.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 18 Jan 2019 13:50:05 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ECsFVkky; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:47621 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkc1c-0001pP-Cx for patch@linaro.org; Fri, 18 Jan 2019 16:50:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56330) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkbl6-0005g6-JO for qemu-devel@nongnu.org; Fri, 18 Jan 2019 16:33:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gkbl4-0005N7-Qa for qemu-devel@nongnu.org; Fri, 18 Jan 2019 16:33:00 -0500 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:45122) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gkbl3-0005J5-58 for qemu-devel@nongnu.org; Fri, 18 Jan 2019 16:32:58 -0500 Received: by mail-pg1-x542.google.com with SMTP id y4so6630308pgc.12 for ; Fri, 18 Jan 2019 13:32:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mMLXq3y5oDzTH+FS6gxmVbqTOM9CfvVIfIxHklj9DEE=; b=ECsFVkkyG2U2ifnOLYIPTNfoG6MEgQK7Dplr84fRKJFiV996G/SHJq2v/56qUPOZtp W6szXUTdSSCh9/Am54pB9BcQJU/S9JnYs9QFQ14rHVV6MPGkYis7oCG4L0Flx/QiVuDQ 6mLQopO6cyS+T4VyLX3FNA1WQkn+EfP1rXV1k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mMLXq3y5oDzTH+FS6gxmVbqTOM9CfvVIfIxHklj9DEE=; b=nZzc3OMDX4jijNOqFioxDOskk0XVTJM1H05LcvjKwjYa55YAHGS9jKuOoMiHwOToRL ydxGnwM3Fo3fBrigUvEyeUpz3n30Nx5Hv1Chc5qwdFA6f18EViXU9SJm+OUTkQQfEVHn DMJ8Dw1pwwWKB87h2BHYYt89fA8Ja5sZWfIh4qr+mUxYK8h9Ks11CCiRhj20+MpCMEpg trlZn8BL2Zq61ZTCJv+OdKk8+iDCa+vRrcR45ZADwedO7aubGgP4DS3+S7JciPeSJ+PT g3EdzB1/sl3rfz5BCVA3y7713uyxOLlO43I6hrnu+eGvmTdNt02fM/Hh+Z7E8JB5D+6H byTA== X-Gm-Message-State: AJcUukddTfVpf/yJoQ6XAB5hcsvNBvSFpvFGaOgwiOH+LsnGDNR9aVa4 2e2TsmysuKBCCTiSM+0gwKeMSfm+13M= X-Received: by 2002:a65:50c1:: with SMTP id s1mr18918723pgp.350.1547847175906; Fri, 18 Jan 2019 13:32:55 -0800 (PST) Received: from cloudburst.twiddle.net ([2001:8000:10e0:a000:c673:a6b6:fdef:1933]) by smtp.gmail.com with ESMTPSA id v12sm5833667pgg.41.2019.01.18.13.32.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 Jan 2019 13:32:55 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 19 Jan 2019 08:31:11 +1100 Message-Id: <20190118213122.22865-38-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190118213122.22865-1-richard.henderson@linaro.org> References: <20190118213122.22865-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::542 Subject: [Qemu-devel] [PATCH v6 38/49] linux-user: Split out nice X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- linux-user/syscall-defs.h | 3 +++ linux-user/syscall-proc.inc.c | 7 +++++++ linux-user/syscall.c | 4 ---- linux-user/strace.list | 3 --- 4 files changed, 10 insertions(+), 7 deletions(-) -- 2.17.2 diff --git a/linux-user/syscall-defs.h b/linux-user/syscall-defs.h index 39e3ae3c21..860754aaca 100644 --- a/linux-user/syscall-defs.h +++ b/linux-user/syscall-defs.h @@ -111,6 +111,9 @@ SYSCALL_DEF(munlockall); SYSCALL_DEF(munmap, ARG_PTR, ARG_DEC); SYSCALL_DEF(name_to_handle_at, ARG_ATDIRFD, ARG_STR, ARG_PTR, ARG_PTR, ARG_ATFLAG); +#ifdef TARGET_NR_nice +SYSCALL_DEF(nice, ARG_DEC); +#endif #ifdef TARGET_NR_open SYSCALL_DEF(open, ARG_STR, ARG_OPENFLAG, ARG_MODEFLAG); #endif diff --git a/linux-user/syscall-proc.inc.c b/linux-user/syscall-proc.inc.c index c09c83775c..58c0a22300 100644 --- a/linux-user/syscall-proc.inc.c +++ b/linux-user/syscall-proc.inc.c @@ -461,6 +461,13 @@ SYSCALL_IMPL(getxpid) } #endif +#ifdef TARGET_NR_nice +SYSCALL_IMPL(nice) +{ + return get_errno(nice(arg1)); +} +#endif + /* * Map host to target signal numbers for the wait family of syscalls. * Assume all other status bits are the same. diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 9074cf8b8d..351b2a6288 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -5327,10 +5327,6 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, void *p; switch(num) { -#ifdef TARGET_NR_nice /* not on alpha */ - case TARGET_NR_nice: - return get_errno(nice(arg1)); -#endif case TARGET_NR_sync: sync(); return 0; diff --git a/linux-user/strace.list b/linux-user/strace.list index fc0eb91e29..aaea23d433 100644 --- a/linux-user/strace.list +++ b/linux-user/strace.list @@ -527,9 +527,6 @@ #ifdef TARGET_NR_nfsservctl { TARGET_NR_nfsservctl, "nfsservctl" , NULL, NULL, NULL }, #endif -#ifdef TARGET_NR_nice -{ TARGET_NR_nice, "nice" , NULL, NULL, NULL }, -#endif #ifdef TARGET_NR_old_adjtimex { TARGET_NR_old_adjtimex, "old_adjtimex" , NULL, NULL, NULL }, #endif