From: Peter Krempa Date: Tue, 30 Mar 2021 13:13:35 +0000 (+0200) Subject: virQEMUCapsInitProcessCaps: Remove obsolete version checks X-Git-Tag: v7.4.0-rc1~292 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a602d36a92ac887824c34cb45ab413bd96b5413;p=thirdparty%2Flibvirt.git virQEMUCapsInitProcessCaps: Remove obsolete version checks We no longer have to mask out IOMMU and NVDIMM support as we no longer support the broken qemu versions. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko Reviewed-by: Pavel Hrdina Reviewed-by: Neal Gompa Reviewed-by: Pavel Hrdina --- diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 831bf063e3..16052ec0b6 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5230,23 +5230,6 @@ virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qemuCaps) static void virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps) { - /* 'intel-iommu' shows up as a device since 2.2.0, but can - * not be used with -device until 2.7.0. Before that it - * requires -machine iommu=on. So we must clear the device - * capability we detected on older QEMUs - */ - if (qemuCaps->version < 2007000 && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_INTEL_IOMMU)) { - virQEMUCapsClear(qemuCaps, QEMU_CAPS_DEVICE_INTEL_IOMMU); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_IOMMU); - } - - /* Prealloc on NVDIMMs is broken on older QEMUs leading to - * user data corruption. If we are dealing with such version - * of QEMU pretend we don't know how to NVDIMM. */ - if (qemuCaps->version < 2009000) - virQEMUCapsClear(qemuCaps, QEMU_CAPS_DEVICE_NVDIMM); - if (ARCH_IS_X86(qemuCaps->arch) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) { virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_CACHE);