|
 |
1b5f1d |
From f0d0a6a9701522eee013682eb0ef566ef7cdac61 Mon Sep 17 00:00:00 2001
|
|
|
1b5f1d |
Message-Id: <f0d0a6a9701522eee013682eb0ef566ef7cdac61@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 |
---
|
|
|
1b5f1d |
src/qemu/qemu_domain.c | 15 +++++++++++++--
|
|
|
1b5f1d |
1 file changed, 13 insertions(+), 2 deletions(-)
|
|
|
d76c62 |
|
|
|
d76c62 |
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
|
|
|
1b5f1d |
index a8401bac30..40fe9985e6 100644
|
|
|
d76c62 |
--- a/src/qemu/qemu_domain.c
|
|
|
d76c62 |
+++ b/src/qemu/qemu_domain.c
|
|
|
1b5f1d |
@@ -8767,8 +8767,19 @@ qemuDomainHasBuiltinIDE(const virDomainDef *def)
|
|
|
1b5f1d |
bool
|
|
|
1b5f1d |
qemuDomainNeedsFDC(const virDomainDef *def)
|
|
|
aa5bf2 |
{
|
|
|
1b5f1d |
- /* all supported Q35 machines need explicit FDC */
|
|
|
1b5f1d |
- return qemuDomainIsQ35(def);
|
|
|
1b5f1d |
+ const char *p;
|
|
|
aa5bf2 |
+
|
|
|
1b5f1d |
+ /* all supported Q35 machines need explicit FDC except for old RHEL-7
|
|
|
1b5f1d |
+ * machine types */
|
|
|
1b5f1d |
+ if (!qemuDomainIsQ35(def))
|
|
|
1b5f1d |
+ return false;
|
|
|
1b5f1d |
+
|
|
|
1b5f1d |
+ if ((p = STRSKIP(def->os.machine, "pc-q35-")) &&
|
|
|
1b5f1d |
+ (STRPREFIX(p, "rhel7.0.0") ||
|
|
|
1b5f1d |
+ STRPREFIX(p, "rhel7.1.0")))
|
|
|
d76c62 |
+ return false;
|
|
|
d76c62 |
+
|
|
|
1b5f1d |
+ return true;
|
|
|
1b5f1d |
}
|
|
|
1b5f1d |
|
|
|
d76c62 |
|
|
|
d76c62 |
--
|
|
|
1e07ec |
2.34.1
|
|
|
d76c62 |
|