]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu_capabilities: Drop version check for QEMU_CAPS_ENABLE_FIPS and QEMU_CAPS_NETDEV_USER
authorMichal Privoznik <mprivozn@redhat.com>
Thu, 27 Jun 2024 14:15:03 +0000 (16:15 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Tue, 2 Jul 2024 07:14:20 +0000 (09:14 +0200)
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 <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
src/qemu/qemu_capabilities.c

index b2c6815934d833adf1f63974119561ef77b129a6..7301fa43377ebcc6ed5dacc17a79ce1f5468a840 100644 (file)
@@ -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);
 }