From e42808c29bdcebe62cdb5cdb1de4dc0910dd21d9 Mon Sep 17 00:00:00 2001 From: "Dr. David Alan Gilbert" Date: Wed, 31 Jul 2019 15:08:10 +0100 Subject: [PATCH 1/6] x86 machine types: pc_rhel_8_0_compat RH-Author: Dr. David Alan Gilbert Message-id: <20190731150814.29571-2-dgilbert@redhat.com> Patchwork-id: 89816 O-Subject: [RHEL-AV-8.1.0 qemu-kvm PATCH v3 1/5] x86 machine types: pc_rhel_8_0_compat Bugzilla: 1719649 RH-Acked-by: Laszlo Ersek RH-Acked-by: Markus Armbruster RH-Acked-by: Cornelia Huck From: "Dr. David Alan Gilbert" Create the pc_rhel_8_0_compat array based off pc_compat_3_1. It's the same except for a chunk of mpx=on entries that we already put in the pc_rhel_7_6_compat. Signed-off-by: Dr. David Alan Gilbert Signed-off-by: Danilo C. L. de Paula --- hw/i386/pc.c | 33 +++++++++++++++++++++++++++++++++ include/hw/i386/pc.h | 3 +++ 2 files changed, 36 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index b3d2d1e..f19fed4 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -366,6 +366,39 @@ GlobalProperty pc_rhel_compat[] = { }; const size_t pc_rhel_compat_len = G_N_ELEMENTS(pc_rhel_compat); +GlobalProperty pc_rhel_8_0_compat[] = { + /* pc_rhel_8_0_compat from pc_compat_3_1 */ + { "intel-iommu", "dma-drain", "off" }, + /* pc_rhel_8_0_compat from pc_compat_3_1 */ + { "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "off" }, + /* pc_rhel_8_0_compat from pc_compat_3_1 */ + { "Opteron_G4" "-" TYPE_X86_CPU, "rdtscp", "off" }, + /* pc_rhel_8_0_compat from pc_compat_3_1 */ + { "Opteron_G4" "-" TYPE_X86_CPU, "npt", "off" }, + /* pc_rhel_8_0_compat from pc_compat_3_1 */ + { "Opteron_G4" "-" TYPE_X86_CPU, "nrip-save", "off" }, + /* pc_rhel_8_0_compat from pc_compat_3_1 */ + { "Opteron_G5" "-" TYPE_X86_CPU, "rdtscp", "off" }, + /* pc_rhel_8_0_compat from pc_compat_3_1 */ + { "Opteron_G5" "-" TYPE_X86_CPU, "npt", "off" }, + /* pc_rhel_8_0_compat from pc_compat_3_1 */ + { "Opteron_G5" "-" TYPE_X86_CPU, "nrip-save", "off" }, + /* pc_rhel_8_0_compat from pc_compat_3_1 */ + { "EPYC" "-" TYPE_X86_CPU, "npt", "off" }, + /* pc_rhel_8_0_compat from pc_compat_3_1 */ + { "EPYC" "-" TYPE_X86_CPU, "nrip-save", "off" }, + /* pc_rhel_8_0_compat from pc_compat_3_1 */ + { "EPYC-IBPB" "-" TYPE_X86_CPU, "npt", "off" }, + /* pc_rhel_8_0_compat from pc_compat_3_1 */ + { "EPYC-IBPB" "-" TYPE_X86_CPU, "nrip-save", "off" }, + /** The mpx=on entries from pc_compat_3_1 are in pc_rhel_7_6_compat **/ + /* pc_rhel_8_0_compat from pc_compat_3_1 */ + { "Cascadelake-Server" "-" TYPE_X86_CPU, "stepping", "5" }, + /* pc_rhel_8_0_compat from pc_compat_3_1 */ + { TYPE_X86_CPU, "x-intel-pt-auto-level", "off" }, +}; +const size_t pc_rhel_8_0_compat_len = G_N_ELEMENTS(pc_rhel_8_0_compat); + /* Similar to PC_COMPAT_3_0 + PC_COMPAT_2_12, but: * all of the 2_12 stuff was already in 7.6 from bz 1481253 * x-migrate-smi-count comes from PC_COMPAT_2_11 but diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 605cc71..2f24333 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -368,6 +368,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_0_compat[]; +extern const size_t pc_rhel_8_0_compat_len; + extern GlobalProperty pc_rhel_7_6_compat[]; extern const size_t pc_rhel_7_6_compat_len; -- 1.8.3.1