[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/9] tests/vm: Extract the kvm_available() handy func
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 2/9] tests/vm: Extract the kvm_available() handy function |
Date: |
Fri, 26 Oct 2018 22:15:22 +0800 |
From: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
---
scripts/qemu.py | 4 ++++
tests/vm/basevm.py | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts/qemu.py b/scripts/qemu.py
index f099ce7278..9fc0be4828 100644
--- 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 cafbc6b3a5..834bc90cc1 100755
--- 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")
--
2.17.1
- [Qemu-devel] [PULL 0/9] Testing patches, Fam Zheng, 2018/10/26
- [Qemu-devel] [PULL 1/9] tests: docker: update test-mingw for GTK+ 2.0 removal, Fam Zheng, 2018/10/26
- [Qemu-devel] [PULL 3/9] tests/vm: Do not abuse parallelism when KVM is not available, Fam Zheng, 2018/10/26
- [Qemu-devel] [PULL 4/9] tests/vm: Do not use the -smp option with a single cpu, Fam Zheng, 2018/10/26
- [Qemu-devel] [PULL 2/9] tests/vm: Extract the kvm_available() handy function,
Fam Zheng <=
- [Qemu-devel] [PULL 5/9] tests/vm: Display remaining seconds to wait for a VM to start, Fam Zheng, 2018/10/26
- [Qemu-devel] [PULL 6/9] tests/vm: Add a BaseVM::arch property, Fam Zheng, 2018/10/26
- [Qemu-devel] [PULL 7/9] tests/vm: Let kvm_available() work in cross environments, Fam Zheng, 2018/10/26
- [Qemu-devel] [PULL 8/9] tests/vm: Do not use -enable-kvm if HOST != TARGET architecture, Fam Zheng, 2018/10/26
- [Qemu-devel] [PULL 9/9] tests/vm: Do not abuse parallelism when HOST != TARGET architecture, Fam Zheng, 2018/10/26
- Re: [Qemu-devel] [PULL 0/9] Testing patches, Peter Maydell, 2018/10/29