From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: mingo@kernel.org, jiangshanlai@gmail.com, dipankar@in.ibm.com,
akpm@linux-foundation.org, mathieu.desnoyers@efficios.com,
josh@joshtriplett.org, tglx@linutronix.de, peterz@infradead.org,
rostedt@goodmis.org, dhowells@redhat.com, edumazet@google.com,
dvhart@linux.intel.com, fweisbec@gmail.com, oleg@redhat.com,
bobby.prani@gmail.com, Boqun Feng <boqun.feng@gmail.com>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Subject: [PATCH tip/core/rcu 09/14] rcutorture: Make -soundhw a x86 specific option
Date: Wed, 15 Jun 2016 15:09:38 -0700 [thread overview]
Message-ID: <1466028583-8780-9-git-send-email-paulmck@linux.vnet.ibm.com> (raw)
In-Reply-To: <20160615220924.GA7877@linux.vnet.ibm.com>
From: Boqun Feng <boqun.feng@gmail.com>
The option "-soundhw pcspk" gives me a error on PPC as follow:
qemu-system-ppc64: ISA bus not available for pcspk
This means this option doesn't work on ppc by default. So simply make
this an x86-specific option via identify_qemu_args().
Signed-off-by: Boqun Feng <boqun.feng@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
---
tools/testing/selftests/rcutorture/bin/functions.sh | 1 +
tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/rcutorture/bin/functions.sh b/tools/testing/selftests/rcutorture/bin/functions.sh
index 616180153208..77fdb46cc65a 100644
--- a/tools/testing/selftests/rcutorture/bin/functions.sh
+++ b/tools/testing/selftests/rcutorture/bin/functions.sh
@@ -171,6 +171,7 @@ identify_qemu_append () {
identify_qemu_args () {
case "$1" in
qemu-system-x86_64|qemu-system-i386)
+ echo -soundhw pcspk
;;
qemu-system-ppc64)
echo -enable-kvm -M pseries -cpu POWER7 -nodefaults
diff --git a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
index 8dc5e4639fb4..ea6e373edc27 100755
--- a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
@@ -8,9 +8,9 @@
#
# Usage: kvm-test-1-run.sh config builddir resdir seconds qemu-args boot_args
#
-# qemu-args defaults to "-enable-kvm -soundhw pcspk -nographic", along with
-# arguments specifying the number of CPUs and other
-# options generated from the underlying CPU architecture.
+# qemu-args defaults to "-enable-kvm -nographic", along with arguments
+# specifying the number of CPUs and other options
+# generated from the underlying CPU architecture.
# boot_args defaults to value returned by the per_version_boot_params
# shell function.
#
@@ -148,7 +148,7 @@ then
fi
# Generate -smp qemu argument.
-qemu_args="-enable-kvm -soundhw pcspk -nographic $qemu_args"
+qemu_args="-enable-kvm -nographic $qemu_args"
cpu_count=`configNR_CPUS.sh $config_template`
cpu_count=`configfrag_boot_cpus "$boot_args" "$config_template" "$cpu_count"`
vcpus=`identify_qemu_vcpus`
--
2.5.2
next prev parent reply other threads:[~2016-06-15 22:12 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-15 22:09 [PATCH tip/core/rcu 0/14] Torture-test changes for 4.8 Paul E. McKenney
2016-06-15 22:09 ` [PATCH tip/core/rcu 01/14] torture: Simplify code, eliminate RCU_PERF_TEST_RUNNABLE Paul E. McKenney
2016-06-15 22:09 ` [PATCH tip/core/rcu 02/14] torture: Remove CONFIG_RCU_TORTURE_TEST_RUNNABLE, simplify code Paul E. McKenney
2016-06-15 22:09 ` [PATCH tip/core/rcu 03/14] torture: Forgive lengthy trace dumps and preemption Paul E. McKenney
2016-06-15 22:09 ` [PATCH tip/core/rcu 04/14] torture: Break online and offline functions out of torture_onoff() Paul E. McKenney
2016-06-15 22:09 ` [PATCH tip/core/rcu 05/14] torture: Add starvation events to error summary Paul E. McKenney
2016-06-15 22:09 ` [PATCH tip/core/rcu 06/14] torture: Stop onoff task if there is only one cpu Paul E. McKenney
2016-06-15 22:09 ` [PATCH tip/core/rcu 07/14] rcutorture/doc: Create initrd using dracut Paul E. McKenney
2016-06-15 22:09 ` [PATCH tip/core/rcu 08/14] rcutorture: Use vmlinux as the fallback kernel image Paul E. McKenney
2016-06-15 22:09 ` Paul E. McKenney [this message]
2016-06-15 22:09 ` [PATCH tip/core/rcu 10/14] rcutorture: Don't specify the cpu type of QEMU on PPC Paul E. McKenney
2016-06-15 22:09 ` [PATCH tip/core/rcu 11/14] rcutorture: Drop "-soundhw pcspkr" from x86 boot arguments Paul E. McKenney
2016-06-15 22:09 ` [PATCH tip/core/rcu 12/14] rcuperf: Don't treat gp_exp mis-setting as a WARN Paul E. McKenney
2016-06-15 22:09 ` [PATCH tip/core/rcu 13/14] torture: Inflict default jitter Paul E. McKenney
2016-06-15 22:09 ` [PATCH tip/core/rcu 14/14] rcutorture: Fix error return code in rcu_perf_init() Paul E. McKenney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1466028583-8780-9-git-send-email-paulmck@linux.vnet.ibm.com \
--to=paulmck@linux.vnet.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=bobby.prani@gmail.com \
--cc=boqun.feng@gmail.com \
--cc=dhowells@redhat.com \
--cc=dipankar@in.ibm.com \
--cc=dvhart@linux.intel.com \
--cc=edumazet@google.com \
--cc=fweisbec@gmail.com \
--cc=jiangshanlai@gmail.com \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mingo@kernel.org \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).