[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/15] python/qemu: accel: Strengthen kvm_available() checks
From: |
Cleber Rosa |
Subject: |
[PULL 13/15] python/qemu: accel: Strengthen kvm_available() checks |
Date: |
Tue, 17 Dec 2019 00:15:19 -0500 |
From: Wainer dos Santos Moschetta <address@hidden>
Currently kvm_available() checks for the presence of kvm module
and, if target and host arches don't mismatch. This patch adds
an 3rd checking: if QEMU binary was compiled with kvm
support.
Signed-off-by: Wainer dos Santos Moschetta <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Reviewed-by: Cleber Rosa <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Cleber Rosa <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cleber Rosa <address@hidden>
---
python/qemu/accel.py | 27 +++++++++++++++++++++------
1 file changed, 21 insertions(+), 6 deletions(-)
diff --git a/python/qemu/accel.py b/python/qemu/accel.py
index 7395cee793..5fce3aa3dd 100644
--- a/python/qemu/accel.py
+++ b/python/qemu/accel.py
@@ -46,9 +46,24 @@ def list_accel(qemu_bin):
# Skip the first line which is the header.
return [acc.strip() for acc in out.splitlines()[1:]]
-def kvm_available(target_arch=None):
- host_arch = os.uname()[4]
- if target_arch and target_arch != host_arch:
- if target_arch != ADDITIONAL_ARCHES.get(host_arch):
- return False
- return os.access("/dev/kvm", os.R_OK | os.W_OK)
+def kvm_available(target_arch=None, qemu_bin=None):
+ """
+ Check if KVM is available using the following heuristic:
+ - Kernel module is present in the host;
+ - Target and host arches don't mismatch;
+ - KVM is enabled in the QEMU binary.
+
+ @param target_arch (str): target architecture
+ @param qemu_bin (str): path to the QEMU binary
+ @return True if kvm is available, otherwise False.
+ """
+ if not os.access("/dev/kvm", os.R_OK | os.W_OK):
+ return False
+ if target_arch:
+ host_arch = os.uname()[4]
+ if target_arch != host_arch:
+ if target_arch != ADDITIONAL_ARCHES.get(host_arch):
+ return False
+ if qemu_bin and "kvm" not in list_accel(qemu_bin):
+ return False
+ return True
--
2.21.0
- [PULL 03/15] analyze-migration.py: fix find() type error, (continued)
- [PULL 03/15] analyze-migration.py: fix find() type error, Cleber Rosa, 2019/12/17
- [PULL 04/15] analyze-migration.py: replace numpy with python 3.2, Cleber Rosa, 2019/12/17
- [PULL 05/15] python/qemu: Add set_qmp_monitor() to QEMUMachine, Cleber Rosa, 2019/12/17
- [PULL 06/15] tests/acceptance: Makes linux_initrd and empty_cpu_model use QEMUMachine, Cleber Rosa, 2019/12/17
- [PULL 07/15] Acceptance test x86_cpu_model_versions: use default vm, Cleber Rosa, 2019/12/17
- [PULL 08/15] Acceptance tests: introduce utility method for tags unique vals, Cleber Rosa, 2019/12/17
- [PULL 10/15] Acceptance tests: use relative location for tests, Cleber Rosa, 2019/12/17
- [PULL 09/15] Acceptance tests: use avocado tags for machine type, Cleber Rosa, 2019/12/17
- [PULL 11/15] python/qemu: Move kvm_available() to its own module, Cleber Rosa, 2019/12/17
- [PULL 12/15] python/qemu: accel: Add list_accel() method, Cleber Rosa, 2019/12/17
- [PULL 13/15] python/qemu: accel: Strengthen kvm_available() checks,
Cleber Rosa <=
- [PULL 14/15] python/qemu: accel: Add tcg_available() method, Cleber Rosa, 2019/12/17
- [PULL 15/15] python/qemu: Remove unneeded imports in __init__, Cleber Rosa, 2019/12/17
- Re: [PULL 00/15] Python queue 2019-12-17, Peter Maydell, 2019/12/17