39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
|
From bcbc897cb19b3a6523de611f48f6bac6cea16c97 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Sebastian Ott <sebott@redhat.com>
|
||
|
|
Date: Thu, 2 May 2024 13:17:03 +0200
|
||
|
|
Subject: [PATCH 2/2] Revert "x86: rhel 9.4.0 machine type compat fix"
|
||
|
|
|
||
|
|
RH-Author: Sebastian Ott <sebott@redhat.com>
|
||
|
|
RH-MergeRequest: 237: Revert "x86: rhel 9.4.0 machine type compat fix"
|
||
|
|
RH-Jira: RHEL-30362
|
||
|
|
RH-Acked-by: Ani Sinha <anisinha@redhat.com>
|
||
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
RH-Commit: [1/1] 858ec153e65e96c39ca4db17ed93fd58c77dc2eb (seott1/cos-qemu-kvm)
|
||
|
|
|
||
|
|
This reverts commit c46e44f0f4e861fe412ce679b0b0204881c1c2f5.
|
||
|
|
|
||
|
|
pc-q35-rhel9.4.0 and newer should stay with SMBIOS_ENTRY_POINT_TYPE_AUTO.
|
||
|
|
|
||
|
|
Signed-off-by: Sebastian Ott <sebott@redhat.com>
|
||
|
|
---
|
||
|
|
hw/i386/pc_q35.c | 3 ---
|
||
|
|
1 file changed, 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
|
||
|
|
index 2f11f9af7d..2b54944c0f 100644
|
||
|
|
--- a/hw/i386/pc_q35.c
|
||
|
|
+++ b/hw/i386/pc_q35.c
|
||
|
|
@@ -734,9 +734,6 @@ static void pc_q35_machine_rhel940_options(MachineClass *m)
|
||
|
|
pcmc->smbios_stream_product = "RHEL";
|
||
|
|
pcmc->smbios_stream_version = "9.4.0";
|
||
|
|
|
||
|
|
- /* From pc_q35_8_2_machine_options() - use SMBIOS 3.X by default */
|
||
|
|
- pcmc->default_smbios_ep_type = SMBIOS_ENTRY_POINT_TYPE_64;
|
||
|
|
-
|
||
|
|
compat_props_add(m->compat_props, hw_compat_rhel_9_5,
|
||
|
|
hw_compat_rhel_9_5_len);
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|