From: Michal Privoznik Date: Thu, 27 Jun 2024 14:15:03 +0000 (+0200) Subject: qemu_capabilities: Drop version check for QEMU_CAPS_ENABLE_FIPS and QEMU_CAPS_NETDEV_USER X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8cf81de8bfadaacb278554de02a0fa6c5cbf8f0f;p=libvirt.git qemu_capabilities: Drop version check for QEMU_CAPS_ENABLE_FIPS and QEMU_CAPS_NETDEV_USER Now that the minimal required version of QEMU is 5.2.0 the conditional setting of QEMU_CAPS_ENABLE_FIPS and QEMU_CAPS_NETDEV_USER is effectively a dead code. Drop it. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b2c6815934..7301fa4337 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5398,19 +5398,8 @@ virQEMUCapsInitQMPArch(virQEMUCaps *qemuCaps, * Add all QEMU capabilities based on version of QEMU. */ static void -virQEMUCapsInitQMPVersionCaps(virQEMUCaps *qemuCaps) +virQEMUCapsInitQMPVersionCaps(virQEMUCaps *qemuCaps G_GNUC_UNUSED) { - /* -enable-fips is deprecated in QEMU 5.2.0, and QEMU - * should be built with gcrypt to achieve FIPS compliance - * automatically / implicitly - */ - if (qemuCaps->version < 5002000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_ENABLE_FIPS); - - /* We are not able to detect this for old QEMU. Assume the capability is - * there. */ - if (qemuCaps->version < 5000000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV_USER); }