131 lines
4.7 KiB
Diff
131 lines
4.7 KiB
Diff
From 1497b5d371a63dd20d3b14ca2f8cce99845a1c2c Mon Sep 17 00:00:00 2001
|
|
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
Date: Wed, 19 May 2021 15:46:27 -0400
|
|
Subject: [PATCH 03/12] x86: Add x86 rhel8.5 machine types
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-MergeRequest: 16: Synchronize with RHEL-AV 8.5 release 21 to RHEL 9
|
|
RH-Commit: [1/8] db81806d99b545abe4dcba576fb33c02ec283dd7 (mrezanin/centos-src-qemu-kvm)
|
|
RH-Bugzilla: 1957194
|
|
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
RH-Acked-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
|
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
|
Add the 8.5 machine type and the compat entries.
|
|
|
|
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
---
|
|
hw/i386/pc.c | 6 ++++++
|
|
hw/i386/pc_piix.c | 2 ++
|
|
hw/i386/pc_q35.c | 24 ++++++++++++++++++++++--
|
|
include/hw/i386/pc.h | 3 +++
|
|
4 files changed, 33 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
|
|
index edc02a68ca..0a374dec39 100644
|
|
--- a/hw/i386/pc.c
|
|
+++ b/hw/i386/pc.c
|
|
@@ -369,6 +369,12 @@ GlobalProperty pc_rhel_compat[] = {
|
|
};
|
|
const size_t pc_rhel_compat_len = G_N_ELEMENTS(pc_rhel_compat);
|
|
|
|
+GlobalProperty pc_rhel_8_4_compat[] = {
|
|
+ /* pc_rhel_8_4_compat from pc_compat_5_2 */
|
|
+ { "ICH9-LPC", "x-smi-cpu-hotunplug", "off" },
|
|
+};
|
|
+const size_t pc_rhel_8_4_compat_len = G_N_ELEMENTS(pc_rhel_8_4_compat);
|
|
+
|
|
GlobalProperty pc_rhel_8_3_compat[] = {
|
|
/* pc_rhel_8_3_compat from pc_compat_5_1 */
|
|
{ "ICH9-LPC", "x-smi-cpu-hotplug", "off" },
|
|
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
index d9c5df16d8..5d61c9b833 100644
|
|
--- a/hw/i386/pc_piix.c
|
|
+++ b/hw/i386/pc_piix.c
|
|
@@ -971,6 +971,8 @@ static void pc_machine_rhel760_options(MachineClass *m)
|
|
pcmc->pci_root_uid = 1;
|
|
compat_props_add(m->compat_props, hw_compat_rhel_8_4,
|
|
hw_compat_rhel_8_4_len);
|
|
+ compat_props_add(m->compat_props, pc_rhel_8_4_compat,
|
|
+ pc_rhel_8_4_compat_len);
|
|
compat_props_add(m->compat_props, hw_compat_rhel_8_3,
|
|
hw_compat_rhel_8_3_len);
|
|
compat_props_add(m->compat_props, pc_rhel_8_3_compat,
|
|
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
|
|
index 44109e4876..01ff3e0544 100644
|
|
--- a/hw/i386/pc_q35.c
|
|
+++ b/hw/i386/pc_q35.c
|
|
@@ -607,6 +607,24 @@ static void pc_q35_machine_rhel_options(MachineClass *m)
|
|
compat_props_add(m->compat_props, pc_rhel_compat, pc_rhel_compat_len);
|
|
}
|
|
|
|
+static void pc_q35_init_rhel850(MachineState *machine)
|
|
+{
|
|
+ pc_q35_init(machine);
|
|
+}
|
|
+
|
|
+static void pc_q35_machine_rhel850_options(MachineClass *m)
|
|
+{
|
|
+ PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
|
+ pc_q35_machine_rhel_options(m);
|
|
+ m->desc = "RHEL-8.5.0 PC (Q35 + ICH9, 2009)";
|
|
+ pcmc->smbios_stream_product = "RHEL-AV";
|
|
+ pcmc->smbios_stream_version = "8.5.0";
|
|
+}
|
|
+
|
|
+DEFINE_PC_MACHINE(q35_rhel850, "pc-q35-rhel8.5.0", pc_q35_init_rhel850,
|
|
+ pc_q35_machine_rhel850_options);
|
|
+
|
|
+
|
|
static void pc_q35_init_rhel840(MachineState *machine)
|
|
{
|
|
pc_q35_init(machine);
|
|
@@ -615,12 +633,15 @@ static void pc_q35_init_rhel840(MachineState *machine)
|
|
static void pc_q35_machine_rhel840_options(MachineClass *m)
|
|
{
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
|
- pc_q35_machine_rhel_options(m);
|
|
+ pc_q35_machine_rhel850_options(m);
|
|
m->desc = "RHEL-8.4.0 PC (Q35 + ICH9, 2009)";
|
|
+ m->alias = NULL;
|
|
pcmc->smbios_stream_product = "RHEL-AV";
|
|
pcmc->smbios_stream_version = "8.4.0";
|
|
compat_props_add(m->compat_props, hw_compat_rhel_8_4,
|
|
hw_compat_rhel_8_4_len);
|
|
+ compat_props_add(m->compat_props, pc_rhel_8_4_compat,
|
|
+ pc_rhel_8_4_compat_len);
|
|
}
|
|
|
|
DEFINE_PC_MACHINE(q35_rhel840, "pc-q35-rhel8.4.0", pc_q35_init_rhel840,
|
|
@@ -637,7 +658,6 @@ static void pc_q35_machine_rhel830_options(MachineClass *m)
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
|
pc_q35_machine_rhel840_options(m);
|
|
m->desc = "RHEL-8.3.0 PC (Q35 + ICH9, 2009)";
|
|
- m->alias = NULL;
|
|
pcmc->smbios_stream_product = "RHEL-AV";
|
|
pcmc->smbios_stream_version = "8.3.0";
|
|
compat_props_add(m->compat_props, hw_compat_rhel_8_3,
|
|
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
|
|
index 79a7803a2f..1980c93f41 100644
|
|
--- a/include/hw/i386/pc.h
|
|
+++ b/include/hw/i386/pc.h
|
|
@@ -281,6 +281,9 @@ extern const size_t pc_compat_1_4_len;
|
|
extern GlobalProperty pc_rhel_compat[];
|
|
extern const size_t pc_rhel_compat_len;
|
|
|
|
+extern GlobalProperty pc_rhel_8_4_compat[];
|
|
+extern const size_t pc_rhel_8_4_compat_len;
|
|
+
|
|
extern GlobalProperty pc_rhel_8_3_compat[];
|
|
extern const size_t pc_rhel_8_3_compat_len;
|
|
|
|
--
|
|
2.27.0
|
|
|