From patchwork Sun May 19 20:36:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 164509 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp4787965ili; Sun, 19 May 2019 13:53:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqyGPzL2cgACicucFeByCU3acUhQq6tgkpkj4iJBlMlbC4JT28GDi08CdDu2Mk7ilpvSPmh3 X-Received: by 2002:a50:b7bc:: with SMTP id h57mr55547827ede.77.1558299230353; Sun, 19 May 2019 13:53:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558299230; cv=none; d=google.com; s=arc-20160816; b=mXY6XBGBFGmUm4lPqwwdcXMmTxfhuhZAol9Msjrfb3e37XU1UrD9OSU7tOxQaMjux6 nF3TwkFDEE0sKouNml2wevofGoBM/AXHqhOXjm5ejn8CvXZe6mb3Iedsjbecqt95ZcS9 pi+7hg/LStw8TwSbYZ0RoCBtA20cbJrlskwfUc4Bw9KzCBSTaU7+BaNxs7JFUsf0fMUk 1EqzfRlYAdnokt2UFCUWWxhsPKD7li7abqw3tHeHwTFKwCxCYMOdlKFSxuKDvcG49ehB 9KXax19V/jPVdXaB9V8U0vIlU0Lp6ucIuHRgnzsMe8agzNG7VOXoDkZQHU345X+Ncnuy XxHA== 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=NM8YohXjNmh5aO/78Xnvs2un3+sKv0xFoH3Xe6VAfyY=; b=LvopWXFaJJwDv+dciN3NQedjpQfpHBdQcZpJfAwrUxrQg0UHshaRBzjw/+MylgdiIH 91qkx/AXHLG6H7TjlDg51WF+ALodLIv0mqAm9k+JUorURhsh0yoSz0EfzQTV7ZG9gZ7s k9NCmLfHcffhwQrycvK5/Y8ZvxWga+to43kBx35tXdQg6e3Awy6OjjgFopfFW3cONyoi LXlZWGFM1ua4QcflBOuA4PeadpbU8mavz83m/HvAY5/5cBkuvVgy9padxwk7s/1FuR8g 2h3b91kpV/B1uaVWvztHhimYzEPMHnxvwiGF2wAiXRsblGEe5v63dNQhUmwX+G9ucrch masw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jUuFL8+P; 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 h17si3507720ejf.169.2019.05.19.13.53.50 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 19 May 2019 13:53:50 -0700 (PDT) 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=jUuFL8+P; 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]:53322 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSSoX-0007lO-4u for patch@linaro.org; Sun, 19 May 2019 16:53:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50369) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSSZC-0003DB-Ab for qemu-devel@nongnu.org; Sun, 19 May 2019 16:38:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hSSZB-0003qW-89 for qemu-devel@nongnu.org; Sun, 19 May 2019 16:37:58 -0400 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:38179) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hSSZB-0003pY-1A for qemu-devel@nongnu.org; Sun, 19 May 2019 16:37:57 -0400 Received: by mail-pg1-x543.google.com with SMTP id j26so5740758pgl.5 for ; Sun, 19 May 2019 13:37:56 -0700 (PDT) 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=NM8YohXjNmh5aO/78Xnvs2un3+sKv0xFoH3Xe6VAfyY=; b=jUuFL8+PmCYyXNNWJMqmhoYeb3XOWwsea+DvhQ+2Px1BxVUrdCGROdI+MKDNF24Htn AXNk48XnhF0Y5fa5YZ6PBcLZ9JxlftTDpW+nszdOHE0O+FtR5/34W08QiDJZM9svpk1e g5QY3SFFoeYARGkXrgLVdxhcWC9GwhEZYeNiVeIzQ+uE/WeWM0UwmLpNFGuPZjMx/i5D AMrx1aMqPnV0u0G4wZtQkbeSyJgwaeKOFCtUFIjOMmNEkJwEoGry7aOPwfmubtNhhoZ/ n/Q66jMVqqCrhuAN640+/uFv6WSCvIatyh8nYjJVbPUiSAQvbIo1V5eHq06dOFhtNvHI iEsA== 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=NM8YohXjNmh5aO/78Xnvs2un3+sKv0xFoH3Xe6VAfyY=; b=f9HTqn4Whxt5gm7AFTRyYMNAx/cvy/fzajunX4WiR6oTmMlt/JG5x7gV8GJ5cgFQMV 46tOt6rmDvGubdnB1pg6MTdzt+ef7sAyjXf6u0J6d7iaq9VctmZ9fzsV+jbaK7r1yoYn JDaufWjztqPz+r3DvZDpuEydk4NVwUXeP3eoIf6Q71oIwkD2vrpbej582o/xSnVFCdvm CD5ACXsWQRxWqGyj+ApQMMwCKAShtIC74/Eaf0EoYmvcw849JPhueyKFnc/1gbGeuasx Wwgt8VPD3kR5owWDCoFZQn24Te2DpXdWQ5CWwNfiXbzT3xvLJizluZAtI0umPOskLonn cecA== X-Gm-Message-State: APjAAAU5b/7yJNesN76PlLwr2941MGmLewkMeybU7p2vK44ScN+ULttM pNA302QZpyoXkf638GqNNV3U9pEg45I= X-Received: by 2002:a63:d150:: with SMTP id c16mr71006064pgj.439.1558298275860; Sun, 19 May 2019 13:37:55 -0700 (PDT) Received: from localhost.localdomain (97-113-13-231.tukw.qwest.net. [97.113.13.231]) by smtp.gmail.com with ESMTPSA id i7sm11397448pfo.19.2019.05.19.13.37.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 May 2019 13:37:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 19 May 2019 13:36:32 -0700 Message-Id: <20190519203726.20729-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190519203726.20729-1-richard.henderson@linaro.org> References: <20190519203726.20729-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::543 Subject: [Qemu-devel] [PATCH v7 20/74] linux-user: Split out creat 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/strace.c | 13 ------------- linux-user/syscall-file.inc.c | 16 ++++++++++++++++ linux-user/syscall.c | 9 --------- linux-user/strace.list | 3 --- 5 files changed, 19 insertions(+), 25 deletions(-) -- 2.17.1 diff --git a/linux-user/syscall-defs.h b/linux-user/syscall-defs.h index f099d98fa3..de7a99f0c6 100644 --- a/linux-user/syscall-defs.h +++ b/linux-user/syscall-defs.h @@ -21,6 +21,9 @@ SYSCALL_DEF_FULL(brk, .impl = impl_brk, .arg_type = { ARG_PTR }); SYSCALL_DEF_ARGS(clone, ARG_CLONEFLAG, ARG_PTR, ARG_PTR, ARG_PTR, ARG_PTR); SYSCALL_DEF(close, ARG_DEC); +#ifdef TARGET_NR_creat +SYSCALL_DEF(creat, ARG_STR, ARG_MODEFLAG); +#endif SYSCALL_DEF(exit, ARG_DEC); #ifdef TARGET_NR_fork SYSCALL_DEF(fork); diff --git a/linux-user/strace.c b/linux-user/strace.c index 842136e425..640a80f32b 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -1195,19 +1195,6 @@ print_clock_adjtime(const struct syscallname *name, } #endif -#ifdef TARGET_NR_creat -static void -print_creat(const struct syscallname *name, - abi_long arg0, abi_long arg1, abi_long arg2, - abi_long arg3, abi_long arg4, abi_long arg5) -{ - print_syscall_prologue(name); - print_string(arg0, 0); - print_file_mode(arg1, 1); - print_syscall_epilogue(name); -} -#endif - #ifdef TARGET_NR_execv static void print_execv(const struct syscallname *name, diff --git a/linux-user/syscall-file.inc.c b/linux-user/syscall-file.inc.c index dd44d5b804..9b966ad627 100644 --- a/linux-user/syscall-file.inc.c +++ b/linux-user/syscall-file.inc.c @@ -24,6 +24,22 @@ SYSCALL_IMPL(close) return get_errno(close(fd)); } +#ifdef TARGET_NR_creat +SYSCALL_IMPL(creat) +{ + char *p = lock_user_string(arg1); + abi_long ret; + + if (!p) { + return -TARGET_EFAULT; + } + ret = get_errno(creat(p, arg2)); + fd_trans_unregister(ret); + unlock_user(p, arg1, 0); + return ret; +} +#endif + /* * Helpers for do_openat, manipulating /proc/self/foo. */ diff --git a/linux-user/syscall.c b/linux-user/syscall.c index bdb0d45d9a..491e1d7cfb 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -5383,15 +5383,6 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, void *p; switch(num) { -#ifdef TARGET_NR_creat /* not on alpha */ - case TARGET_NR_creat: - if (!(p = lock_user_string(arg1))) - return -TARGET_EFAULT; - ret = get_errno(creat(p, arg2)); - fd_trans_unregister(ret); - unlock_user(p, arg1, 0); - return ret; -#endif #ifdef TARGET_NR_link case TARGET_NR_link: { diff --git a/linux-user/strace.list b/linux-user/strace.list index 759b35458e..41f8f8d0d0 100644 --- a/linux-user/strace.list +++ b/linux-user/strace.list @@ -94,9 +94,6 @@ #ifdef TARGET_NR_connect { TARGET_NR_connect, "connect" , "%s(%d,%#x,%d)", NULL, NULL }, #endif -#ifdef TARGET_NR_creat -{ TARGET_NR_creat, "creat" , NULL, print_creat, NULL }, -#endif #ifdef TARGET_NR_create_module { TARGET_NR_create_module, "create_module" , NULL, NULL, NULL }, #endif