From 804b6b95f243d4f3dcf4bca3f08e835fc88bfdfd Mon Sep 17 00:00:00 2001
Message-Id: <804b6b95f243d4f3dcf4bca3f08e835fc88bfdfd@dist-git>
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
Date: Mon, 22 Feb 2016 12:51:51 +0100
Subject: [PATCH] RHEL: Add rhel machine types to qemuDomainMachineNeedsFDC

RHEL-only.

pc-q35-rhel7.0.0 and pc-q35-rhel7.1.0 do not need an explicit
isa-fdc controller.

https://bugzilla.redhat.com/show_bug.cgi?id=1227880

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/qemu/qemu_domain.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 1f45b30975..0f6b9f980a 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -8696,10 +8696,16 @@ static bool
 qemuDomainMachineNeedsFDC(const char *machine,
                           const virArch arch)
 {
+    const char *p = STRSKIP(machine, "pc-q35-");
+
     if (!ARCH_IS_X86(arch))
         return false;
 
-    if (!STRPREFIX(machine, "pc-q35-"))
+    if (!p)
+        return false;
+
+    if (STRPREFIX(p, "rhel7.0.0") ||
+        STRPREFIX(p, "rhel7.1.0"))
         return false;
 
     return true;
-- 
2.34.1