From dbf43a42b8bb66d53c7cbab05f104c28097f811e Mon Sep 17 00:00:00 2001
From: Daniel Mack <daniel@zonque.org>
Date: Thu, 19 Nov 2015 13:17:15 +0100
Subject: test: make qemu use kvm if available

If we're running in a KVM virtualized environment (such as Semaphore's
Docker enabled platform), pass '-cpu host' to QEMU.
---
 test/test-functions | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'test/test-functions')

diff --git a/test/test-functions b/test/test-functions
index 0a9d4f80ac..5d223dbc63 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -68,8 +68,7 @@ selinux=0 \
 $KERNEL_APPEND \
 "
 
-    QEMU_OPTIONS="-machine accel=kvm:tcg \
--smp $QEMU_SMP \
+    QEMU_OPTIONS="-smp $QEMU_SMP \
 -net none \
 -m 512M \
 -nographic \
@@ -80,6 +79,10 @@ $KERNEL_APPEND \
         QEMU_OPTIONS="$QEMU_OPTIONS -initrd $INITRD"
     fi
 
+    if [ -c /dev/kvm ]; then
+        QEMU_OPTIONS="$QEMU_OPTIONS -machine accel=kvm -enable-kvm -cpu host"
+    fi
+
     ( set -x
       $QEMU_BIN $QEMU_OPTIONS -append "$KERNEL_APPEND" $TESTDIR/rootdisk.img ) || return 1
 }
-- 
cgit v1.2.3-54-g00ecf