Commit 88513ae5 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

torture: Remove qemu dependency on EFI firmware 

On some (probably misconfigured) systems, the torture-test scripting
will cause qemu to complain about missing EFI firmware, often because
qemu is trying to traverse broken symbolic links to find that firmware.
Which is a bit silly given that the default torture-test guest OS has
but a single binary for its userspace, and thus is unlikely to do much
in the way of networking in any case.

This commit therefore avoids such problems by specifying "-net none"
to qemu unless the TORTURE_QEMU_INTERACTIVE environment variable is set
(for example, by having specified "--interactive" to kvm.sh), in which
case "-net nic -net user" is specified to qemu instead.  Either choice
may be overridden by specifying the "-net" argument of your choice to
the kvm.sh "--qemu-args" parameter.

Link: https://lore.kernel.org/lkml/20190701141403.GA246562@google.com


Reported-by: default avatarJoel Fernandes <joel@joelfernandes.org>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
parent 9ebcfadb

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

+18 −3
Original line number Diff line number Diff line
@@ -215,9 +215,6 @@ identify_qemu_args () { 
		then

			echo -device spapr-vlan,netdev=net0,mac=$TORTURE_QEMU_MAC

			echo -netdev bridge,br=br0,id=net0

		elif test -n "$TORTURE_QEMU_INTERACTIVE"

		then

			echo -net nic -net user

		fi

		;;

	esac
@@ -275,3 +272,21 @@ specify_qemu_cpus () { 
		esac

	fi

}



# specify_qemu_net qemu-args

#

# Appends a string containing "-net none" to qemu-args, unless the incoming

# qemu-args already contains "-smp" or unless the TORTURE_QEMU_INTERACTIVE

# environment variable is set, in which case the string that is be added is

# instead "-net nic -net user".

specify_qemu_net () {

	if echo $1 | grep -q -e -net

	then

		echo $1

	elif test -n "$TORTURE_QEMU_INTERACTIVE"

	then

		echo $1 -net nic -net user

	else

		echo $1 -net none

	fi

}

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

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ then 
	cpu_count=$TORTURE_ALLOTED_CPUS

fi

qemu_args="`specify_qemu_cpus "$QEMU" "$qemu_args" "$cpu_count"`"

qemu_args="`specify_qemu_net "$qemu_args"`"



# Generate architecture-specific and interaction-specific qemu arguments

qemu_args="$qemu_args `identify_qemu_args "$QEMU" "$resdir/console.log"`"

CRA Git | Maintained and supported by SUSTech CRA and CCSE