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

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