From: Marc-André Lureau <[email protected]>
QEMU annotates the accelerator names in "-accel help" with their
security status, eg "kvm (secure)". kvm_available() compares the
entries with the plain accelerator name, so the check fails and
functional tests using require_accelerator('kvm') are silently
skipped.
Keep only the accelerator name of each line.
fwiw, I am surprised we don't seem to have a CI that exercice functional
kvm tests, or compare against a baseline to avoid this kind of
regression.
Fixes: d3b770fc6342 ("system: report acclerator security status in help output")
Signed-off-by: Marc-André Lureau <[email protected]>
---
python/qemu/utils/accel.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/python/qemu/utils/accel.py b/python/qemu/utils/accel.py
index f915b646692e..7e3f43d6b489 100644
--- a/python/qemu/utils/accel.py
+++ b/python/qemu/utils/accel.py
@@ -47,8 +47,9 @@ def list_accel(qemu_bin: str) -> List[str]:
except:
LOG.debug("Failed to get the list of accelerators in %s", qemu_bin)
raise
- # Skip the first line which is the header.
- return [acc.strip() for acc in out.splitlines()[1:]]
+ # Skip the first line which is the header, and drop annotations
+ # such as " (secure)" from the accelerator names.
+ return [acc.split(' ')[0] for acc in out.splitlines()[1:]]
def kvm_available(target_arch: Optional[str] = None,
--
2.56.0.116.g6de20f6092dc