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