From 8f2d2f7f26df5e62807f4fd53a1774086ea2c564 Mon Sep 17 00:00:00 2001 Message-Id: <8f2d2f7f26df5e62807f4fd53a1774086ea2c564@dist-git> From: =?UTF-8?q?J=C3=A1n=20Tomko?= 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 --- 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 584bf5003f..604d0521b0 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8666,10 +8666,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.33.0