|
 |
7f1c5b |
From f33ca8aed4744238230f1f2cc47df77aa4c9e0ac Mon Sep 17 00:00:00 2001
|
|
|
7f1c5b |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
7f1c5b |
Date: Thu, 17 Nov 2022 12:36:30 +0000
|
|
|
7f1c5b |
Subject: x86: rhel 9.2.0 machine type
|
|
|
7f1c5b |
|
|
|
7f1c5b |
Add a 9.2.0 x86 machine type, and fix up the compatibility
|
|
|
7f1c5b |
for 9.0.0 and older.
|
|
|
7f1c5b |
|
|
|
7f1c5b |
pc_compat_7_1 and pc_compat_7_0 are both empty upstream so there's
|
|
|
7f1c5b |
nothing to do there.
|
|
|
7f1c5b |
|
|
|
7f1c5b |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
7f1c5b |
---
|
|
|
7f1c5b |
hw/i386/pc_piix.c | 1 +
|
|
|
7f1c5b |
hw/i386/pc_q35.c | 21 ++++++++++++++++++++-
|
|
|
7f1c5b |
2 files changed, 21 insertions(+), 1 deletion(-)
|
|
|
7f1c5b |
|
|
|
7f1c5b |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
7f1c5b |
index 173a1fd10b..fc06877344 100644
|
|
|
7f1c5b |
--- a/hw/i386/pc_piix.c
|
|
|
7f1c5b |
+++ b/hw/i386/pc_piix.c
|
|
|
7f1c5b |
@@ -944,6 +944,7 @@ static void pc_machine_rhel760_options(MachineClass *m)
|
|
|
7f1c5b |
/* From pc_i440fx_5_1_machine_options() */
|
|
|
7f1c5b |
pcmc->pci_root_uid = 1;
|
|
|
7f1c5b |
pcmc->legacy_no_rng_seed = true;
|
|
|
7f1c5b |
+ pcmc->enforce_amd_1tb_hole = false;
|
|
|
7f1c5b |
compat_props_add(m->compat_props, hw_compat_rhel_9_1,
|
|
|
7f1c5b |
hw_compat_rhel_9_1_len);
|
|
|
7f1c5b |
compat_props_add(m->compat_props, hw_compat_rhel_9_0,
|
|
|
7f1c5b |
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
|
|
|
7f1c5b |
index 97c3630021..52cfe3bf45 100644
|
|
|
7f1c5b |
--- a/hw/i386/pc_q35.c
|
|
|
7f1c5b |
+++ b/hw/i386/pc_q35.c
|
|
|
7f1c5b |
@@ -692,6 +692,23 @@ static void pc_q35_machine_rhel_options(MachineClass *m)
|
|
|
7f1c5b |
compat_props_add(m->compat_props, pc_rhel_compat, pc_rhel_compat_len);
|
|
|
7f1c5b |
}
|
|
|
7f1c5b |
|
|
|
7f1c5b |
+static void pc_q35_init_rhel920(MachineState *machine)
|
|
|
7f1c5b |
+{
|
|
|
7f1c5b |
+ pc_q35_init(machine);
|
|
|
7f1c5b |
+}
|
|
|
7f1c5b |
+
|
|
|
7f1c5b |
+static void pc_q35_machine_rhel920_options(MachineClass *m)
|
|
|
7f1c5b |
+{
|
|
|
7f1c5b |
+ PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
|
|
7f1c5b |
+ pc_q35_machine_rhel_options(m);
|
|
|
7f1c5b |
+ m->desc = "RHEL-9.2.0 PC (Q35 + ICH9, 2009)";
|
|
|
7f1c5b |
+ pcmc->smbios_stream_product = "RHEL";
|
|
|
7f1c5b |
+ pcmc->smbios_stream_version = "9.2.0";
|
|
|
7f1c5b |
+}
|
|
|
7f1c5b |
+
|
|
|
7f1c5b |
+DEFINE_PC_MACHINE(q35_rhel920, "pc-q35-rhel9.2.0", pc_q35_init_rhel920,
|
|
|
7f1c5b |
+ pc_q35_machine_rhel920_options);
|
|
|
7f1c5b |
+
|
|
|
7f1c5b |
static void pc_q35_init_rhel900(MachineState *machine)
|
|
|
7f1c5b |
{
|
|
|
7f1c5b |
pc_q35_init(machine);
|
|
|
7f1c5b |
@@ -700,11 +717,13 @@ static void pc_q35_init_rhel900(MachineState *machine)
|
|
|
7f1c5b |
static void pc_q35_machine_rhel900_options(MachineClass *m)
|
|
|
7f1c5b |
{
|
|
|
7f1c5b |
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
|
|
7f1c5b |
- pc_q35_machine_rhel_options(m);
|
|
|
7f1c5b |
+ pc_q35_machine_rhel920_options(m);
|
|
|
7f1c5b |
m->desc = "RHEL-9.0.0 PC (Q35 + ICH9, 2009)";
|
|
|
7f1c5b |
+ m->alias = NULL;
|
|
|
7f1c5b |
pcmc->smbios_stream_product = "RHEL";
|
|
|
7f1c5b |
pcmc->smbios_stream_version = "9.0.0";
|
|
|
7f1c5b |
pcmc->legacy_no_rng_seed = true;
|
|
|
7f1c5b |
+ pcmc->enforce_amd_1tb_hole = false;
|
|
|
7f1c5b |
compat_props_add(m->compat_props, hw_compat_rhel_9_1,
|
|
|
7f1c5b |
hw_compat_rhel_9_1_len);
|
|
|
7f1c5b |
compat_props_add(m->compat_props, hw_compat_rhel_9_0,
|
|
|
7f1c5b |
--
|
|
|
7f1c5b |
2.31.1
|
|
|
7f1c5b |
|