[PATCH 02/21] qemuDomainNeedsFDC: Simplify and improve checking if a machine needs FDC

[Peter Krempa]

Commit c7f3a1f7870 turned qemuDomainMachineNeedsFDC() effectively into
qemuDomainIsQ35. Use it instead as it also matches the non-canonicalized
'q35'.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_domain.c | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 3f10f9306f..a8401bac30 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -8685,20 +8685,6 @@ bool qemuDomainHasBuiltinESP(const virDomainDef *def)
 }


-static bool
-qemuDomainMachineNeedsFDC(const char *machine,
-                          const virArch arch)
-{
-    if (!ARCH_IS_X86(arch))
-        return false;
-
-    if (!STRPREFIX(machine, "pc-q35-"))
-        return false;
-
-    return true;
-}
-
-
 bool
 qemuDomainIsQ35(const virDomainDef *def)
 {
@@ -8781,7 +8767,8 @@ qemuDomainHasBuiltinIDE(const virDomainDef *def)
 bool
 qemuDomainNeedsFDC(const virDomainDef *def)
 {
-    return qemuDomainMachineNeedsFDC(def->os.machine, def->os.arch);
+    /* all supported Q35 machines need explicit FDC */
+    return qemuDomainIsQ35(def);
 }


-- 
2.31.1