Blame SOURCES/libvirt-RHEL-Add-rhel-machine-types-to-qemuDomainMachineNeedsFDC.patch
|
 |
76f597 |
From 0414b6f6f28b4ff1db04c6eed18b118294cac49a Mon Sep 17 00:00:00 2001
|
|
|
76f597 |
Message-Id: <0414b6f6f28b4ff1db04c6eed18b118294cac49a@dist-git>
|
|
|
d76c62 |
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
|
d76c62 |
Date: Mon, 22 Feb 2016 12:51:51 +0100
|
|
|
d76c62 |
Subject: [PATCH] RHEL: Add rhel machine types to qemuDomainMachineNeedsFDC
|
|
|
d76c62 |
|
|
|
d76c62 |
RHEL-only.
|
|
|
d76c62 |
|
|
|
d76c62 |
pc-q35-rhel7.0.0 and pc-q35-rhel7.1.0 do not need an explicit
|
|
|
d76c62 |
isa-fdc controller.
|
|
|
d76c62 |
|
|
|
d76c62 |
https://bugzilla.redhat.com/show_bug.cgi?id=1227880
|
|
|
d76c62 |
|
|
|
d76c62 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
d76c62 |
---
|
|
|
aa5bf2 |
src/qemu/qemu_domain.c | 8 +++++++-
|
|
|
aa5bf2 |
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
d76c62 |
|
|
|
d76c62 |
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
|
|
|
76f597 |
index 209337404a..7735d134eb 100644
|
|
|
d76c62 |
--- a/src/qemu/qemu_domain.c
|
|
|
d76c62 |
+++ b/src/qemu/qemu_domain.c
|
|
|
76f597 |
@@ -8696,10 +8696,16 @@ static bool
|
|
|
aa5bf2 |
qemuDomainMachineNeedsFDC(const char *machine,
|
|
|
aa5bf2 |
const virArch arch)
|
|
|
aa5bf2 |
{
|
|
|
aa5bf2 |
+ const char *p = STRSKIP(machine, "pc-q35-");
|
|
|
aa5bf2 |
+
|
|
|
aa5bf2 |
if (!ARCH_IS_X86(arch))
|
|
|
d76c62 |
return false;
|
|
|
d76c62 |
|
|
|
aa5bf2 |
- if (!STRPREFIX(machine, "pc-q35-"))
|
|
|
aa5bf2 |
+ if (!p)
|
|
|
d76c62 |
+ return false;
|
|
|
d76c62 |
+
|
|
|
aa5bf2 |
+ if (STRPREFIX(p, "rhel7.0.0") ||
|
|
|
aa5bf2 |
+ STRPREFIX(p, "rhel7.1.0"))
|
|
|
aa5bf2 |
return false;
|
|
|
d76c62 |
|
|
|
aa5bf2 |
return true;
|
|
|
d76c62 |
--
|
|
|
76f597 |
2.33.1
|
|
|
d76c62 |
|