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

Commit 16d301cb authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcutorture: Move common qemu flags to kvm-test-1.sh 



Currently, most qemu flags are calculated in kvm-test-1-rcu.sh,
except that -nographics is set up by kvm.sh.  This commit promotes
one-stop shopping by consolidating the determination of qemu flags into
kvm-test-1-rcu.sh.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
parent bad80440

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

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ echo ' ---' `date`: Starting kernel 
QEMU="`identify_qemu $builddir/vmlinux.o`"



# Generate -smp qemu argument.

qemu_args="-nographic $qemu_args"

cpu_count=`configNR_CPUS.sh $config_template`

vcpus=`identify_qemu_vcpus`

if test $cpu_count -gt $vcpus

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

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ do 
	fi

	mkdir "${rd}"

	echo Results directory: $rd

	kvm-test-1-rcu.sh $CONFIGFRAG/$kversion/$CF $builddir $rd $dur "-nographic $RCU_QEMU_ARG" "$RCU_BOOTARGS"

	kvm-test-1-rcu.sh $CONFIGFRAG/$kversion/$CF $builddir $rd $dur "$RCU_QEMU_ARG" "$RCU_BOOTARGS"

done

# Tracing: trace_event=rcu:rcu_grace_period,rcu:rcu_future_grace_period,rcu:rcu_grace_period_init,rcu:rcu_nocb_wake,rcu:rcu_preempt_task,rcu:rcu_unlock_preempted_task,rcu:rcu_quiescent_state_report,rcu:rcu_fqs,rcu:rcu_callback,rcu:rcu_kfree_callback,rcu:rcu_batch_start,rcu:rcu_invoke_callback,rcu:rcu_invoke_kfree_callback,rcu:rcu_batch_end,rcu:rcu_torture_read,rcu:rcu_barrier