From ac3f9a72141a48d40fabfff561d5a7dc0e1b810d Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 10 Jul 2018 12:22:31 +0200 Subject: [PATCH] x86/spec-ctrl: command line handling adjustments For one, "no-xen" should not imply "no-eager-fpu", as "eager FPU" mode is to guard guests, not Xen itself, which is also expressed so by print_details(). And then opt_ssbd, despite being off by default, should also be cleared by the "no" and "no-xen" sub-options. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/spec_ctrl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 08e6784c4c..73dc7170c7 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -124,6 +124,8 @@ static int __init parse_spec_ctrl(const char *s) opt_msr_sc_pv = false; opt_msr_sc_hvm = false; + opt_eager_fpu = 0; + disable_common: opt_rsb_pv = false; opt_rsb_hvm = false; @@ -131,7 +133,7 @@ static int __init parse_spec_ctrl(const char *s) opt_thunk = THUNK_JMP; opt_ibrs = 0; opt_ibpb = false; - opt_eager_fpu = 0; + opt_ssbd = false; } else if ( val > 0 ) rc = -EINVAL; -- 2.30.2