qemu: simplify machine-type check for implicit floppy controller

Q35 machine types 2.3 and older had an integrated floppy controller.

Support for these machine types was removed by QEMU commit

  commit 86165b499edf8b03bb2d0e926d116c2f12a95bfe
      q35: Remove old machine versions
  git describe: v2.5.0-1530-g86165b499e contains: v2.6.0-rc0~76^2~4

In libvirt, we have bumped the minimum QEMU version to 2.11:

  commit b4cbdbe90bbf85eaf687f532d5a52a11e664b781
    qemu: Formally deprecate support for qemu < 2.11
  git describe: v7.3.0-13-gb4cbdbe90b contains: v7.4.0-rc1~300

Since this QEMU version only supports Q35 machine versions 2.4+,
remove the code dealing with older ones.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 9baa4b5d90f21ebc11d360ee73cfce16754e7c3b..50a921c80d273a19a7f9e43c7284e411c04914c1 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -8823,21 +8823,11 @@ static bool
 qemuDomainMachineNeedsFDC(const char *machine,
                           const virArch arch)
 {
-    const char *p = STRSKIP(machine, "pc-q35-");
-
     if (!ARCH_IS_X86(arch))
         return false;
 
-    if (!p)
-        return false;
-
-    if (STRPREFIX(p, "1.") ||
-        STREQ(p, "2.0") ||
-        STREQ(p, "2.1") ||
-        STREQ(p, "2.2") ||
-        STREQ(p, "2.3")) {
+    if (!STRPREFIX(machine, "pc-q35-"))
         return false;
-    }
 
     return true;
 }