cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-Revert-redhat-Enable-FDC-device-for-upstream-machine.patch

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