Blame SOURCES/kvm-Revert-redhat-Add-hw_compat_4_2_extra-and-apply-to-u.patch

432cb7
From e626dc16d130c724c400b99a93daad0a9abeae59 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 01/18] Revert "redhat: Add hw_compat_4_2_extra and apply to
432cb7
 upstream machines"
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: [1/3] 47b7d9e5062f5e215d5ed1a3ecdc1a87ac3fa630 (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 dc2e9ec1e014950c7918e23a3e9b0096b34a4a92
432cb7
Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
432cb7
Date:   Wed Mar 9 10:31:53 2022 +0000
432cb7
432cb7
    Revert "redhat: Add hw_compat_4_2_extra and apply to upstream machines"
432cb7
432cb7
    This reverts commit 66882f9a3230246409f3918424aca26add5c034a.
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 dc2e9ec1e014950c7918e23a3e9b0096b34a4a92)
432cb7
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
432cb7
---
432cb7
 hw/i386/pc.c         | 12 ------------
432cb7
 hw/i386/pc_piix.c    |  6 ------
432cb7
 include/hw/i386/pc.h |  3 ---
432cb7
 3 files changed, 21 deletions(-)
432cb7
432cb7
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
432cb7
index 4c08a1971c..357257349b 100644
432cb7
--- a/hw/i386/pc.c
432cb7
+++ b/hw/i386/pc.c
432cb7
@@ -670,18 +670,6 @@ GlobalProperty pc_rhel_7_0_compat[] = {
432cb7
 };
432cb7
 const size_t pc_rhel_7_0_compat_len = G_N_ELEMENTS(pc_rhel_7_0_compat);
432cb7
 
432cb7
-/*
432cb7
- * RHEL: These properties only apply to the RHEL exported machine types
432cb7
- * pc-4.2/2.11 for the purpose to have a limited upstream machines support
432cb7
- * which can be migrated to RHEL.  Let's avoid touching hw_compat_4_2 directly
432cb7
- * so that we can have some isolation against the upstream code.
432cb7
- */
432cb7
-GlobalProperty hw_compat_4_2_extra[] = {
432cb7
-    /* By default enlarge the default virtio-net-pci ROM to 512KB. */
432cb7
-    { "virtio-net-pci", "romsize", "0x80000" },
432cb7
-};
432cb7
-const size_t hw_compat_4_2_extra_len = G_N_ELEMENTS(hw_compat_4_2_extra);
432cb7
-
432cb7
 GSIState *pc_gsi_create(qemu_irq **irqs, bool pci_enabled)
432cb7
 {
432cb7
     GSIState *s;
432cb7
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
432cb7
index c30057c443..7b7076cbc7 100644
432cb7
--- a/hw/i386/pc_piix.c
432cb7
+++ b/hw/i386/pc_piix.c
432cb7
@@ -531,12 +531,6 @@ static void pc_i440fx_4_2_machine_options(MachineClass *m)
432cb7
      * supported by RHEL, even if exported.
432cb7
      */
432cb7
     m->deprecation_reason = "Not supported by RHEL";
432cb7
-    /*
432cb7
-     * RHEL: Specific compat properties to have limited support for upstream
432cb7
-     * machines exported.
432cb7
-     */
432cb7
-    compat_props_add(m->compat_props, hw_compat_4_2_extra,
432cb7
-                     hw_compat_4_2_extra_len);
432cb7
 }
432cb7
 
432cb7
 /* RHEL: Export pc-4.2 */
432cb7
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
432cb7
index 9e8bfb69f8..4a593acb50 100644
432cb7
--- a/include/hw/i386/pc.h
432cb7
+++ b/include/hw/i386/pc.h
432cb7
@@ -325,9 +325,6 @@ extern const size_t pc_rhel_7_1_compat_len;
432cb7
 extern GlobalProperty pc_rhel_7_0_compat[];
432cb7
 extern const size_t pc_rhel_7_0_compat_len;
432cb7
 
432cb7
-extern GlobalProperty hw_compat_4_2_extra[];
432cb7
-extern const size_t hw_compat_4_2_extra_len;
432cb7
-
432cb7
 /* Helper for setting model-id for CPU models that changed model-id
432cb7
  * depending on QEMU versions up to QEMU 2.4.
432cb7
  */
432cb7
-- 
432cb7
2.27.0
432cb7