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