|
 |
4841a6 |
From 5bf8f1d69fea1225e927fbb3efe549a2a9d47d92 Mon Sep 17 00:00:00 2001
|
|
|
4841a6 |
From: Jon Maloy <jmaloy@redhat.com>
|
|
|
4841a6 |
Date: Tue, 22 Mar 2022 19:23:36 -0400
|
|
|
4841a6 |
Subject: [PATCH 02/18] Revert "redhat: Enable FDC device for upstream machines
|
|
|
60061b |
too"
|
|
|
60061b |
|
|
|
4841a6 |
RH-Author: Jon Maloy <jmaloy@redhat.com>
|
|
|
4841a6 |
RH-MergeRequest: 131: Revert "redhat: Add hw_compat_4_2_extra and apply to upstream machines"
|
|
|
4841a6 |
RH-Commit: [2/3] 4e3c945e3de9bb9d9a6d24115f0719168c9669fe (jmaloy/qemu-kvm)
|
|
|
4841a6 |
RH-Bugzilla: 2062613
|
|
|
60061b |
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
|
4841a6 |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
60061b |
|
|
|
4841a6 |
BZ: https://bugzilla.redhat.com/2062613
|
|
|
4841a6 |
UPSTREAM: no
|
|
|
4841a6 |
BREW: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=44038000
|
|
|
60061b |
|
|
|
4841a6 |
commit 597cb6ca1da4a3eea77c1e4928f55203a1d5c70c
|
|
|
4841a6 |
Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
4841a6 |
Date: Wed Mar 9 10:32:39 2022 +0000
|
|
|
4841a6 |
|
|
|
4841a6 |
Revert "redhat: Enable FDC device for upstream machines too"
|
|
|
4841a6 |
|
|
|
4841a6 |
This reverts commit c4d1aa8bf21fe98da94a9cff30b7c25bed12c17f.
|
|
|
4841a6 |
We no longer need these compat machines it was added for.
|
|
|
4841a6 |
|
|
|
4841a6 |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
4841a6 |
|
|
|
4841a6 |
(cherry picked from commit 597cb6ca1da4a3eea77c1e4928f55203a1d5c70c)
|
|
|
4841a6 |
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
|
|
|
60061b |
---
|
|
|
60061b |
hw/block/fdc.c | 5 +----
|
|
|
60061b |
1 file changed, 1 insertion(+), 4 deletions(-)
|
|
|
60061b |
|
|
|
60061b |
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
|
|
|
60061b |
index 63042ef030..97fa6de423 100644
|
|
|
60061b |
--- a/hw/block/fdc.c
|
|
|
60061b |
+++ b/hw/block/fdc.c
|
|
|
60061b |
@@ -2341,10 +2341,7 @@ void fdctrl_realize_common(DeviceState *dev, FDCtrl *fdctrl, Error **errp)
|
|
|
60061b |
|
|
|
60061b |
/* Restricted for Red Hat Enterprise Linux: */
|
|
|
60061b |
MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine());
|
|
|
60061b |
- if (!strstr(mc->name, "-rhel7.") &&
|
|
|
60061b |
- /* Exported two upstream machine types allows FDC too */
|
|
|
60061b |
- strcmp(mc->name, "pc-i440fx-4.2") &&
|
|
|
60061b |
- strcmp(mc->name, "pc-i440fx-2.11")) {
|
|
|
60061b |
+ if (!strstr(mc->name, "-rhel7.")) {
|
|
|
60061b |
error_setg(errp, "Device %s is not supported with machine type %s",
|
|
|
60061b |
object_get_typename(OBJECT(dev)), mc->name);
|
|
|
60061b |
return;
|
|
|
60061b |
--
|
|
|
60061b |
2.27.0
|
|
|
60061b |
|