tests/vm: Extract the kvm_available() handy function

Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Message-Id: <20181013004034[email protected]>
Reviewed-by: Richard Henderson <[email protected]>
Signed-off-by: Fam Zheng <[email protected]>

diff --git a/scripts/qemu.py b/scripts/qemu.py
index f099ce72782f2dc7ba636a05be5385ad78a85a0a..9fc0be48283f3d296494555205ec7f2bb6d6b433 100644 (file)
--- a/scripts/qemu.py
+++ b/scripts/qemu.py
@@ -26,6 +26,10 @@ import tempfile
 LOG = logging.getLogger(__name__)
 
 
+def kvm_available(target_arch=None):
+    return os.access("/dev/kvm", os.R_OK | os.W_OK)
+
+
 #: Maps machine types to the preferred console device types
 CONSOLE_DEV_TYPES = {
     r'^clipper$': 'isa-serial',

diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index cafbc6b3a585dec47332264bbad322d3aa42e123..834bc90cc1fe0dd35f5a240b126271fe996aa585 100755 (executable)
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -18,7 +18,7 @@ import logging
 import time
 import datetime
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "scripts"))
-from qemu import QEMUMachine
+from qemu import QEMUMachine, kvm_available
 import subprocess
 import hashlib
 import optparse
@@ -72,7 +72,7 @@ class BaseVM(object):
             "-serial", "file:%s" % os.path.join(self._tmpdir, "serial.out")]
         if vcpus:
             self._args += ["-smp", str(vcpus)]
-        if os.access("/dev/kvm", os.R_OK | os.W_OK):
+        if kvm_available():
             self._args += ["-enable-kvm"]
         else:
             logging.info("KVM not available, not using -enable-kvm")