Blame SOURCES/kvm-Revert-redhat-Expose-upstream-machines-pc-4.2-and-pc.patch

4841a6
From ee3cae3bb349469edcf725a1c5161521e95dcb9f 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 03/18] Revert "redhat: Expose upstream machines pc-4.2 and
60061b
 pc-2.11"
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: [3/3] 35cee68034580f81b3aa916921eecd2fdfa7dd15 (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 f3b50d6d4ae0be9e64aafe6a15f5423bab4899e9
4841a6
Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
4841a6
Date:   Wed Mar 9 10:34:58 2022 +0000
4841a6
4841a6
    Revert "redhat: Expose upstream machines pc-4.2 and pc-2.11"
4841a6
    This reverts commit 618e2424edba499d52cd26cf8363bc2dd85ef149.
4841a6
    We no longer need these compat machines.
4841a6
4841a6
    Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
4841a6
4841a6
(cherry picked from commit f3b50d6d4ae0be9e64aafe6a15f5423bab4899e9)
4841a6
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
60061b
---
60061b
 hw/i386/pc_piix.c | 37 -------------------------------------
60061b
 1 file changed, 37 deletions(-)
60061b
60061b
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
60061b
index 7b7076cbc7..f03a8f0db8 100644
60061b
--- a/hw/i386/pc_piix.c
60061b
+++ b/hw/i386/pc_piix.c
60061b
@@ -315,14 +315,6 @@ static void pc_init1(MachineState *machine,
60061b
  * hw_compat_*, pc_compat_*, or * pc_*_machine_options().
60061b
  */
60061b
 
60061b
-/*
60061b
- * NOTE!  Not all the upstream machine types are disabled for RHEL.  For
60061b
- * providing a very limited support for upstream machine types, pc machines
60061b
- * 2.11 and 4.2 are exposed explicitly.  This will make the below "#if" macros
60061b
- * a bit messed up, but please read this comment first so that we can have a
60061b
- * rough understanding of what we're going to do.
60061b
- */
60061b
-
60061b
 #if 0 /* Disabled for Red Hat Enterprise Linux */
60061b
 static void pc_compat_2_3_fn(MachineState *machine)
60061b
 {
60061b
@@ -399,8 +391,6 @@ static void pc_xen_hvm_init(MachineState *machine)
60061b
 }
60061b
 #endif
60061b
 
60061b
-#endif /* Disabled for Red Hat Enterprise Linux */
60061b
-
60061b
 #define DEFINE_I440FX_MACHINE(suffix, name, compatfn, optionfn) \
60061b
     static void pc_init_##suffix(MachineState *machine) \
60061b
     { \
60061b
@@ -465,10 +455,8 @@ static void pc_i440fx_6_0_machine_options(MachineClass *m)
60061b
     compat_props_add(m->compat_props, pc_compat_6_0, pc_compat_6_0_len);
60061b
 }
60061b
 
60061b
-#if 0 /* Disabled for Red Hat Enterprise Linux */
60061b
 DEFINE_I440FX_MACHINE(v6_0, "pc-i440fx-6.0", NULL,
60061b
                       pc_i440fx_6_0_machine_options);
60061b
-#endif /* Disabled for Red Hat Enterprise Linux */
60061b
 
60061b
 static void pc_i440fx_5_2_machine_options(MachineClass *m)
60061b
 {
60061b
@@ -479,10 +467,8 @@ static void pc_i440fx_5_2_machine_options(MachineClass *m)
60061b
     compat_props_add(m->compat_props, pc_compat_5_2, pc_compat_5_2_len);
60061b
 }
60061b
 
60061b
-#if 0 /* Disabled for Red Hat Enterprise Linux */
60061b
 DEFINE_I440FX_MACHINE(v5_2, "pc-i440fx-5.2", NULL,
60061b
                       pc_i440fx_5_2_machine_options);
60061b
-#endif /* Disabled for Red Hat Enterprise Linux */
60061b
 
60061b
 static void pc_i440fx_5_1_machine_options(MachineClass *m)
60061b
 {
60061b
@@ -497,10 +483,8 @@ static void pc_i440fx_5_1_machine_options(MachineClass *m)
60061b
     pcmc->pci_root_uid = 1;
60061b
 }
60061b
 
60061b
-#if 0 /* Disabled for Red Hat Enterprise Linux */
60061b
 DEFINE_I440FX_MACHINE(v5_1, "pc-i440fx-5.1", NULL,
60061b
                       pc_i440fx_5_1_machine_options);
60061b
-#endif /* Disabled for Red Hat Enterprise Linux */
60061b
 
60061b
 static void pc_i440fx_5_0_machine_options(MachineClass *m)
60061b
 {
60061b
@@ -513,10 +497,8 @@ static void pc_i440fx_5_0_machine_options(MachineClass *m)
60061b
     m->auto_enable_numa_with_memdev = false;
60061b
 }
60061b
 
60061b
-#if 0 /* Disabled for Red Hat Enterprise Linux */
60061b
 DEFINE_I440FX_MACHINE(v5_0, "pc-i440fx-5.0", NULL,
60061b
                       pc_i440fx_5_0_machine_options);
60061b
-#endif /* Disabled for Red Hat Enterprise Linux */
60061b
 
60061b
 static void pc_i440fx_4_2_machine_options(MachineClass *m)
60061b
 {
60061b
@@ -525,15 +507,8 @@ static void pc_i440fx_4_2_machine_options(MachineClass *m)
60061b
     m->is_default = false;
60061b
     compat_props_add(m->compat_props, hw_compat_4_2, hw_compat_4_2_len);
60061b
     compat_props_add(m->compat_props, pc_compat_4_2, pc_compat_4_2_len);
60061b
-
60061b
-    /*
60061b
-     * RHEL: Mark all upstream machines as deprecated because they're not
60061b
-     * supported by RHEL, even if exported.
60061b
-     */
60061b
-    m->deprecation_reason = "Not supported by RHEL";
60061b
 }
60061b
 
60061b
-/* RHEL: Export pc-4.2 */
60061b
 DEFINE_I440FX_MACHINE(v4_2, "pc-i440fx-4.2", NULL,
60061b
                       pc_i440fx_4_2_machine_options);
60061b
 
60061b
@@ -546,10 +521,8 @@ static void pc_i440fx_4_1_machine_options(MachineClass *m)
60061b
     compat_props_add(m->compat_props, pc_compat_4_1, pc_compat_4_1_len);
60061b
 }
60061b
 
60061b
-#if 0 /* Disabled for Red Hat Enterprise Linux */
60061b
 DEFINE_I440FX_MACHINE(v4_1, "pc-i440fx-4.1", NULL,
60061b
                       pc_i440fx_4_1_machine_options);
60061b
-#endif /* Disabled for Red Hat Enterprise Linux */
60061b
 
60061b
 static void pc_i440fx_4_0_machine_options(MachineClass *m)
60061b
 {
60061b
@@ -562,10 +535,8 @@ static void pc_i440fx_4_0_machine_options(MachineClass *m)
60061b
     compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len);
60061b
 }
60061b
 
60061b
-#if 0 /* Disabled for Red Hat Enterprise Linux */
60061b
 DEFINE_I440FX_MACHINE(v4_0, "pc-i440fx-4.0", NULL,
60061b
                       pc_i440fx_4_0_machine_options);
60061b
-#endif /* Disabled for Red Hat Enterprise Linux */
60061b
 
60061b
 static void pc_i440fx_3_1_machine_options(MachineClass *m)
60061b
 {
60061b
@@ -581,10 +552,8 @@ static void pc_i440fx_3_1_machine_options(MachineClass *m)
60061b
     compat_props_add(m->compat_props, pc_compat_3_1, pc_compat_3_1_len);
60061b
 }
60061b
 
60061b
-#if 0 /* Disabled for Red Hat Enterprise Linux */
60061b
 DEFINE_I440FX_MACHINE(v3_1, "pc-i440fx-3.1", NULL,
60061b
                       pc_i440fx_3_1_machine_options);
60061b
-#endif /* Disabled for Red Hat Enterprise Linux */
60061b
 
60061b
 static void pc_i440fx_3_0_machine_options(MachineClass *m)
60061b
 {
60061b
@@ -593,10 +562,8 @@ static void pc_i440fx_3_0_machine_options(MachineClass *m)
60061b
     compat_props_add(m->compat_props, pc_compat_3_0, pc_compat_3_0_len);
60061b
 }
60061b
 
60061b
-#if 0 /* Disabled for Red Hat Enterprise Linux */
60061b
 DEFINE_I440FX_MACHINE(v3_0, "pc-i440fx-3.0", NULL,
60061b
                       pc_i440fx_3_0_machine_options);
60061b
-#endif /* Disabled for Red Hat Enterprise Linux */
60061b
 
60061b
 static void pc_i440fx_2_12_machine_options(MachineClass *m)
60061b
 {
60061b
@@ -605,10 +572,8 @@ static void pc_i440fx_2_12_machine_options(MachineClass *m)
60061b
     compat_props_add(m->compat_props, pc_compat_2_12, pc_compat_2_12_len);
60061b
 }
60061b
 
60061b
-#if 0 /* Disabled for Red Hat Enterprise Linux */
60061b
 DEFINE_I440FX_MACHINE(v2_12, "pc-i440fx-2.12", NULL,
60061b
                       pc_i440fx_2_12_machine_options);
60061b
-#endif /* Disabled for Red Hat Enterprise Linux */
60061b
 
60061b
 static void pc_i440fx_2_11_machine_options(MachineClass *m)
60061b
 {
60061b
@@ -617,11 +582,9 @@ static void pc_i440fx_2_11_machine_options(MachineClass *m)
60061b
     compat_props_add(m->compat_props, pc_compat_2_11, pc_compat_2_11_len);
60061b
 }
60061b
 
60061b
-/* RHEL: Export pc-2.11 */
60061b
 DEFINE_I440FX_MACHINE(v2_11, "pc-i440fx-2.11", NULL,
60061b
                       pc_i440fx_2_11_machine_options);
60061b
 
60061b
-#if 0 /* Disabled for Red Hat Enterprise Linux */
60061b
 static void pc_i440fx_2_10_machine_options(MachineClass *m)
60061b
 {
60061b
     pc_i440fx_2_11_machine_options(m);
60061b
-- 
60061b
2.27.0
60061b