picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

test: allow overriding of the KVM detection using TEST_NO_KVM

Browse source 
By default the run_qemu() function enables KVM automatically
if it detects the /dev/kvm char device and if the machine is not
already a KVM one. Let's add a TEST_NO_KVM env variable to suppress
this detection.
This commit is contained in:
Frantisek Sumsal 2019-03-16 18:01:01 +01:00
parent c81a46b904
commit b43c2c01e9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/test-functions
View file

@ -60,7 +60,7 @@ function find_qemu_bin() {
# SUSE and Red Hat call the binary qemu-kvm. Debian and Gentoo call it kvm.
# Either way, only use this version if we aren't running in KVM, because
# nested KVM is flaky still.
if [ `systemd-detect-virt -v` != kvm ] ; then
if [[ $(systemd-detect-virt -v) != kvm && -z $TEST_NO_KVM ]] ; then
[ "$QEMU_BIN" ] || QEMU_BIN=$(which -a kvm qemu-kvm 2>/dev/null | grep '^/' -m1)
fi
@ -192,7 +192,7 @@ $KERNEL_APPEND \
fi
# Let's use KVM if it is available, but let's avoid using nested KVM as that is still flaky
if [ -c /dev/kvm -a `systemd-detect-virt -v` != kvm ]; then
if [[ -c /dev/kvm && $(systemd-detect-virt -v) != kvm && -z $TEST_NO_KVM ]] ; then
QEMU_OPTIONS="$QEMU_OPTIONS -machine accel=kvm -enable-kvm -cpu host"
fi