Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b2f48f2 authored by Boqun Feng's avatar Boqun Feng Committed by Paul E. McKenney
Browse files

rcutorture: Make -soundhw a x86 specific option 



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: default avatarBoqun Feng <boqun.feng@gmail.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
parent 1b900c6a

tools/testing/selftests/rcutorture/bin/functions.sh

+1 −0
Original line number Diff line number Diff line
@@ -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

tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh

+4 −4
Original line number Diff line number Diff line
@@ -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`