瀏覽代碼

tests/vm: Extract the kvm_available() handy function

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20181013004034.6968-2-f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Fam Zheng <famz@redhat.com>
Philippe Mathieu-Daudé 6 年之前
父節點
當前提交
b59b82eded
共有 2 個文件被更改,包括 6 次插入2 次删除
  1. 4 0
      scripts/qemu.py
  2. 2 2
      tests/vm/basevm.py

+ 4 - 0
scripts/qemu.py

@@ -26,6 +26,10 @@
 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',

+ 2 - 2
tests/vm/basevm.py

@@ -18,7 +18,7 @@
 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 @@ def __init__(self, debug=False, vcpus=None):
             "-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")