From eae7d8dd3c3b9aa859a619933f52a4759a42bf66 Mon Sep 17 00:00:00 2001 From: "Dr. David Alan Gilbert" Date: Tue, 23 Nov 2021 17:57:42 +0000 Subject: x86/rhel machine types: Add pc_rhel_8_5_compat RH-Author: Dr. David Alan Gilbert RH-MergeRequest: 76: 9.0/6.2.0-rc1 x86 machine type fixes RH-Commit: [21/22] dd23060695bc0ad892bbfa51d93afe31f5d745c7 RH-Bugzilla: 2025468 RH-Acked-by: quintela1 RH-Acked-by: Vitaly Kuznetsov RH-Acked-by: Cornelia Huck Add pc_rhel_8_5_compat as the merge of pc_compat_6_1 and pc_compat_6_0 (since 8.5 was based on 6.0). Note, x-keep-pci-slot-hpc flipped back and forward, leaving it out looks like it leaves us with the original. Signed-off-by: Dr. David Alan Gilbert Signed-off-by: Miroslav Rezanina --- hw/i386/pc.c | 21 +++++++++++++++++++++ include/hw/i386/pc.h | 3 +++ 2 files changed, 24 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index b6d2db8d04..4661473d2a 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -387,6 +387,27 @@ GlobalProperty pc_rhel_compat[] = { }; const size_t pc_rhel_compat_len = G_N_ELEMENTS(pc_rhel_compat); +GlobalProperty pc_rhel_8_5_compat[] = { + /* pc_rhel_8_5_compat from pc_compat_6_0 */ + { "qemu64" "-" TYPE_X86_CPU, "family", "6" }, + /* pc_rhel_8_5_compat from pc_compat_6_0 */ + { "qemu64" "-" TYPE_X86_CPU, "model", "6" }, + /* pc_rhel_8_5_compat from pc_compat_6_0 */ + { "qemu64" "-" TYPE_X86_CPU, "stepping", "3" }, + /* pc_rhel_8_5_compat from pc_compat_6_0 */ + { TYPE_X86_CPU, "x-vendor-cpuid-only", "off" }, + /* pc_rhel_8_5_compat from pc_compat_6_0 */ + { "ICH9-LPC", ACPI_PM_PROP_ACPI_PCIHP_BRIDGE, "off" }, + + /* pc_rhel_8_5_compat from pc_compat_6_1 */ + { TYPE_X86_CPU, "hv-version-id-build", "0x1bbc" }, + /* pc_rhel_8_5_compat from pc_compat_6_1 */ + { TYPE_X86_CPU, "hv-version-id-major", "0x0006" }, + /* pc_rhel_8_5_compat from pc_compat_6_1 */ + { TYPE_X86_CPU, "hv-version-id-minor", "0x0001" }, +}; +const size_t pc_rhel_8_5_compat_len = G_N_ELEMENTS(pc_rhel_8_5_compat); + GlobalProperty pc_rhel_8_4_compat[] = { /* pc_rhel_8_4_compat from pc_compat_5_2 */ { "ICH9-LPC", "x-smi-cpu-hotunplug", "off" }, diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 9689a58b14..afb570ba14 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -283,6 +283,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_5_compat[]; +extern const size_t pc_rhel_8_5_compat_len; + extern GlobalProperty pc_rhel_8_4_compat[]; extern const size_t pc_rhel_8_4_compat_len; -- 2.27.0