From 597cb6ca1da4a3eea77c1e4928f55203a1d5c70c Mon Sep 17 00:00:00 2001 From: "Dr. David Alan Gilbert" Date: Wed, 9 Mar 2022 10:32:39 +0000 Subject: [PATCH 2/6] Revert "redhat: Enable FDC device for upstream machines too" RH-Author: Dr. David Alan Gilbert RH-MergeRequest: 121: x86: Remove upstream compat machines RH-Commit: [2/3] 1d4d284babe8fe5b25ccb4ca85daf6f8c6cedcc2 RH-Bugzilla: 2061856 RH-Acked-by: Stephen Tweedie RH-Acked-by: quintela1 RH-Acked-by: Peter Xu This reverts commit c4d1aa8bf21fe98da94a9cff30b7c25bed12c17f. We no longer need these compat machines it was added for. Signed-off-by: Dr. David Alan Gilbert --- 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