From 4921c669250aa91ce11c041568c0de093c211e29 Mon Sep 17 00:00:00 2001 From: Suraj Jitindar Singh Date: Tue, 13 Mar 2018 05:21:38 +0100 Subject: [PATCH 16/17] redhat: Define the pseries-rhel7.4-sxxm machine type RH-Author: Suraj Jitindar Singh Message-id: <1520918499-27663-11-git-send-email-sursingh@redhat.com> Patchwork-id: 79256 O-Subject: [RHEL7.5 qemu-kvm-rhev PATCH 10/11] redhat: Define the pseries-rhel7.4-sxxm machine type Bugzilla: 1554957 RH-Acked-by: David Gibson RH-Acked-by: Laurent Vivier RH-Acked-by: Miroslav Rezanina The sxxm (speculative execution exploit mitigation) machine type is a variant of the 7.4 machine type with workarounds for speculative execution vulnerabilities enabled by default. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1548919 Signed-off-by: Suraj Jitindar Singh Signed-off-by: Miroslav Rezanina --- hw/ppc/spapr.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 9d63c00..3d210b3 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4189,6 +4189,28 @@ static void spapr_machine_rhel740_class_options(MachineClass *mc) DEFINE_SPAPR_MACHINE(rhel740, "rhel7.4.0", false); /* + * pseries-rhel7.4.0-sxxm + * + * pseries-rhel7.4.0 with speculative execution exploit mitigations enabled by default + */ +static void spapr_machine_rhel740sxxm_instance_options(MachineState *machine) +{ + spapr_machine_rhel740_instance_options(machine); +} + +static void spapr_machine_rhel740sxxm_class_options(MachineClass *mc) +{ + sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc); + + spapr_machine_rhel740_class_options(mc); + smc->default_caps.caps[SPAPR_CAP_CFPC] = SPAPR_CAP_WORKAROUND; + smc->default_caps.caps[SPAPR_CAP_SBBC] = SPAPR_CAP_WORKAROUND; + smc->default_caps.caps[SPAPR_CAP_IBS] = SPAPR_CAP_FIXED_CCD; +} + +DEFINE_SPAPR_MACHINE(rhel740sxxm, "rhel7.4.0-sxxm", false); + +/* * pseries-rhel7.3.0 * like SPAPR_COMPAT_2_6/_2_7/_2_8 but "ddw" has been backported to RHEL7_3 */ -- 1.8.3.1