From: Peter Krempa Date: Thu, 10 Feb 2022 10:04:42 +0000 (+0100) Subject: qemu: capabilities: Remove tautological version checks X-Git-Tag: v8.3.0-rc1~184 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b948802ceda0338bc7ec0c3a3c8e792c56a7618e;p=thirdparty%2Flibvirt.git qemu: capabilities: Remove tautological version checks Some version checks no longer make sense as the minimum supported qemu is now qemu-3.1. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2714db25ec..2e5537189d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -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)) {