[Xen-changelog] [xen stable-4.6] x86/spec-ctrl: command line handling adjustments

[patchbot@xxxxxxx]

commit 2d69b6d00d6ac04bda01e7323bcd006f0f88ceb7
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Mon Jul 30 14:17:45 2018 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Jul 30 14:17:45 2018 +0200

    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 <jbeulich@xxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    master commit: ac3f9a72141a48d40fabfff561d5a7dc0e1b810d
    master date: 2018-07-10 12:22:31 +0200
---
 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 6ca9bca471..5ee3b5ad9c 100644
--- a/xen/arch/x86/spec_ctrl.c
+++ b/xen/arch/x86/spec_ctrl.c
@@ -108,6 +108,8 @@ static int __init parse_spec_ctrl(char *s)
             opt_msr_sc_pv = 0;
             opt_msr_sc_hvm = 0;
 
+            opt_eager_fpu = 0;
+
         disable_common:
             opt_rsb_pv = 0;
             opt_rsb_hvm = 0;
@@ -115,7 +117,7 @@ static int __init parse_spec_ctrl(char *s)
             opt_thunk = THUNK_JMP;
             opt_ibrs = 0;
             opt_ibpb = 0;
-            opt_eager_fpu = 0;
+            opt_ssbd = 0;
         }
         else if ( val > 0 )
             rc = -EINVAL;
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.6

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog