Skip to content

Commit 10f84c2

Browse files
committed
torture: Avoid torture-test reboot loops
Currently, the various torture tests sometimes react to an early-boot bug by rebooting. This is almost always counterproductive, needlessly consuming CPU time and bloating the console log. This commit therefore adds the "-no-reboot" argument to qemu so that reboot requests will cause qemu to exit. Signed-off-by: Paul E. McKenney <[email protected]>
1 parent db5dc35 commit 10f84c2

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
#
1010
# Usage: kvm-test-1-run.sh config resdir seconds qemu-args boot_args_in
1111
#
12-
# qemu-args defaults to "-enable-kvm -nographic", along with arguments
13-
# specifying the number of CPUs and other options
14-
# generated from the underlying CPU architecture.
12+
# qemu-args defaults to "-enable-kvm -nographic -no-reboot", along with
13+
# arguments specifying the number of CPUs and
14+
# other options generated from the underlying
15+
# CPU architecture.
1516
# boot_args_in defaults to value returned by the per_version_boot_params
1617
# shell function.
1718
#
@@ -139,7 +140,7 @@ then
139140
fi
140141

141142
# Generate -smp qemu argument.
142-
qemu_args="-enable-kvm -nographic $qemu_args"
143+
qemu_args="-enable-kvm -nographic -no-reboot $qemu_args"
143144
cpu_count=`configNR_CPUS.sh $resdir/ConfigFragment`
144145
cpu_count=`configfrag_boot_cpus "$boot_args_in" "$config_template" "$cpu_count"`
145146
if test "$cpu_count" -gt "$TORTURE_ALLOTED_CPUS"

0 commit comments

Comments
 (0)