From 6762f5646943c759ece5972f08eb88364cf0a8ad Mon Sep 17 00:00:00 2001 From: "Dr. David Alan Gilbert" Date: Tue, 23 Nov 2021 18:07:49 +0000 Subject: x86/rhel machine types: Wire compat into q35 and i440fx RH-Author: Dr. David Alan Gilbert RH-MergeRequest: 76: 9.0/6.2.0-rc1 x86 machine type fixes RH-Commit: [22/22] e2767df0d920773057cb52d346e0106a76cb0a28 RH-Bugzilla: 2025468 RH-Acked-by: quintela1 RH-Acked-by: Vitaly Kuznetsov RH-Acked-by: Cornelia Huck Wire the pc_rhel_8_5 compat data into both piix and q35 to keep the existing machine types compatible. Signed-off-by: Dr. David Alan Gilbert Signed-off-by: Miroslav Rezanina --- hw/i386/pc_piix.c | 4 ++++ hw/i386/pc_q35.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index dabc6c1933..183b5d5464 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -993,6 +993,10 @@ static void pc_machine_rhel760_options(MachineClass *m) pcmc->kvmclock_create_always = false; /* From pc_i440fx_5_1_machine_options() */ pcmc->pci_root_uid = 1; + compat_props_add(m->compat_props, hw_compat_rhel_8_5, + hw_compat_rhel_8_5_len); + compat_props_add(m->compat_props, pc_rhel_8_5_compat, + pc_rhel_8_5_compat_len); 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, diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 04c911da18..0e7e885e78 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -658,6 +658,10 @@ static void pc_q35_machine_rhel850_options(MachineClass *m) m->desc = "RHEL-8.5.0 PC (Q35 + ICH9, 2009)"; pcmc->smbios_stream_product = "RHEL-AV"; pcmc->smbios_stream_version = "8.5.0"; + compat_props_add(m->compat_props, hw_compat_rhel_8_5, + hw_compat_rhel_8_5_len); + compat_props_add(m->compat_props, pc_rhel_8_5_compat, + pc_rhel_8_5_compat_len); } DEFINE_PC_MACHINE(q35_rhel850, "pc-q35-rhel8.5.0", pc_q35_init_rhel850, -- 2.27.0