]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: capabilities: Remove tautological version checks
authorPeter Krempa <pkrempa@redhat.com>
Thu, 10 Feb 2022 10:04:42 +0000 (11:04 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Mon, 4 Apr 2022 10:26:59 +0000 (12:26 +0200)
Some version checks no longer make sense as the minimum supported qemu
is now qemu-3.1.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/qemu/qemu_capabilities.c

index 2714db25ec231b60c7fa944d6a6b4e75a26802b0..2e5537189da864f5bba30e0a0b06b8ab57db7197 100644 (file)
@@ -3269,12 +3269,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;
@@ -5311,9 +5305,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);
     }
 
     if (ARCH_IS_S390(qemuCaps->arch)) {