On a Thursday in 2022, Peter Krempa wrote:
Some version checks no longer make sense as the minimum supported qemu
is now qemu-3.1.
Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
src/qemu/qemu_capabilities.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 0ff0e12f75..35bf07142a 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3261,12 +3261,6 @@ virQEMUCapsProbeHVF(virQEMUCaps *qemuCaps)
if (qemuCaps->arch != hostArch)
return 0;
- /* We don't have a nice way to probe whether the QEMU binary
- * contains HVF support, but we know that versions older than
- * QEMU 2.12 didn't have the feature at all */
- if (qemuCaps->version < 2012000)
- return 0;
-
/* We need the OS to report Hypervisor.framework availability */
if (sysctlbyname("kern.hv_support", &hv_support, &len, NULL, 0) < 0)
return 0;
@@ -5303,9 +5297,7 @@ virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps)
* query-cpu-model-expansion arguments even though it was not properly
* advertised as a CPU property.
*/
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_MIGRATABLE) ||
- qemuCaps->version < 2012000)
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE);
After this change, this capability effectively means ARCH_IS_X86. Its only user - virQEMUCapsProbeQMPHostCPU - already has some arch-specific code, so I don't see the value in keeping this capability. Jano
}
if (ARCH_IS_S390(qemuCaps->arch)) {
--
2.34.1
Attachment:
signature.asc
Description: PGP signature
