Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2431328imm; Thu, 7 Jun 2018 10:27:09 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKVcjW6iNFTNpU2TnCcpqjrReALqlPYITVMG/+nYG77TzC7IDqaTC2/Tj4FggwwP7DlG/c1 X-Received: by 2002:a17:902:8b85:: with SMTP id ay5-v6mr2878227plb.30.1528392429502; Thu, 07 Jun 2018 10:27:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528392429; cv=none; d=google.com; s=arc-20160816; b=l1WzNfezEZ8dhX0Wj+YWtugiORifna10zpCvS8YdjZKNe5eSDz4W/uvaJXutzi8BYV SefevZZGKSy2lWL91phqlIhzvCiOpEv6oOjnczcmNkcnD6ceMnp7uRb75J/j6PTHewX8 RhnXmqQ9mbMMNtQPFmUdjwB8eI0sauZzH054p58ZQTk1uYuw+gP87doCT5DkxjAzHgya qZIM3KMoK6eDZvKG2JIc62CQnO6qrAVEb2Tz7hLDOMUeDyilJp3So8eymqe25w9zJKck cHL8gGny3VB7RQmc5ZLMMlEoI+9JLo9QmNGfZTbQfczjN4gvVzQX24GJEqkG1FVPbDmE GYiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:subject:message-id:date:cc:to :from:mime-version:content-transfer-encoding:content-disposition :arc-authentication-results; bh=UTJHvhpWsuGD2XDFEHJVSw248weJRU+YlCu2PN4nsSY=; b=0N3OyAP/XWRwPawn+bU7SUTVwX/3mEy9vpRqyiYxu71Y24kBZLjCWD9a/16Gt/7gwL lLeWpRoKouoMgj/rOuszgGeESvbRTw77Ex9lWdOPK1SOm9FMJOqgmx+POJ9vC1Ac+bl/ v/SNGgC1ydVI0DbbF8PQeIQ4AnqakPLJQ/thtP06heHZ8YbzL3uUBPTFoZNY7ryjWZmO jNJ5ZBCdJceFUYSt3ifP9pyej9QNALGqiYXsJCg7GETKmLnJn0Rwtif4mKJOrR9UZF7D kCC1KWkQtDhZsNQaN6iywWoyPhTm3R+vbhxyx4hfyE/MIvDQYwuZNLNz0vlxlkSVIzU3 39xA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j12-v6si10659719pgc.584.2018.06.07.10.26.55; Thu, 07 Jun 2018 10:27:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933869AbeFGOdD (ORCPT + 99 others); Thu, 7 Jun 2018 10:33:03 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:40298 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933431AbeFGOc4 (ORCPT ); Thu, 7 Jun 2018 10:32:56 -0400 Received: from [148.252.241.226] (helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1fQvbu-0005Zo-5N; Thu, 07 Jun 2018 15:09:54 +0100 Received: from ben by deadeye with local (Exim 4.91) (envelope-from ) id 1fQvb0-0002nk-Kq; Thu, 07 Jun 2018 15:08:58 +0100 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "SeongJae Park" , "Paul E. McKenney" Date: Thu, 07 Jun 2018 15:05:21 +0100 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.16 081/410] rcutorture/kvm.sh: Use consistent help text for --qemu-args In-Reply-To: X-SA-Exim-Connect-IP: 148.252.241.226 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.57-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: SeongJae Park commit 8dcd6f3fe206c0bb8996e59386a04027b1c2fb9b upstream. The '--qemu-args' option's help text is wrongly copied from '--qemu-cmd' option and its argument type description message format is inconsistent with other arguments. This commit fixes the usage and type messages to be consistent with others. Fixes: e9ce640001c6 ("rcutorture: Add --qemu-args argument to kvm.sh") Signed-off-by: SeongJae Park Signed-off-by: Paul E. McKenney [bwh: Backported to 3.16: adjust context] Signed-off-by: Ben Hutchings --- tools/testing/selftests/rcutorture/bin/kvm.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/tools/testing/selftests/rcutorture/bin/kvm.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm.sh @@ -67,7 +67,7 @@ usage () { echo " --kversion vN.NN" echo " --mac nn:nn:nn:nn:nn:nn" echo " --no-initrd" - echo " --qemu-args qemu-system-..." + echo " --qemu-args qemu-arguments" echo " --qemu-cmd qemu-system-..." echo " --results absolute-pathname" echo " --torture rcu" @@ -142,7 +142,7 @@ do TORTURE_INITRD=""; export TORTURE_INITRD ;; --qemu-args) - checkarg --qemu-args "-qemu args" $# "$2" '^-' '^error' + checkarg --qemu-args "(qemu arguments)" $# "$2" '^-' '^error' TORTURE_QEMU_ARG="$2" shift ;;