From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Mon, 15 Jun 2020 12:42:11 +0000 (+0100)
Subject: x86/cpuid: Introduce missing feature adjustment in calculate_pv_def_policy()
X-Git-Tag: 4.14.0-rc3~8
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fde4acd5feb7961269a2e6edd918c7a46626cf6b;p=people%2Fjgross%2Fxen.git

x86/cpuid: Introduce missing feature adjustment in calculate_pv_def_policy()

This was an accidental asymmetry with the HVM side.

No change in behaviour at this point.

Fixes: 83b387382 ("x86/cpuid: Introduce and use default CPUID policies")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Release-acked-by: Paul Durrant <paul@xen.org>
---

diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c
index ee11087626..f2fc0aa895 100644
--- a/xen/arch/x86/cpuid.c
+++ b/xen/arch/x86/cpuid.c
@@ -402,6 +402,8 @@ static void __init calculate_pv_def_policy(void)
     for ( i = 0; i < ARRAY_SIZE(pv_featureset); ++i )
         pv_featureset[i] &= pv_def_featuremask[i];
 
+    guest_common_feature_adjustments(pv_featureset);
+
     sanitise_featureset(pv_featureset);
     cpuid_featureset_to_policy(pv_featureset, p);
     recalculate_xstate(p);