[Xen-changelog] [xen staging] x86: fix "xpti=" and "pv-l1tf=" yet again

[patchbot@xxxxxxx]

commit 8743d2dea539617e237c77556a91dc357098a8af
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Thu Oct 4 14:49:56 2018 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Oct 4 14:49:56 2018 +0200

    x86: fix "xpti=" and "pv-l1tf=" yet again
    
    While commit 2a3b34ec47 ("x86/spec-ctrl: Yet more fixes for xpti=
    parsing") indeed fixed "xpti=dom0", it broke "xpti=no-dom0", in that
    this then became equivalent to "xpti=no". In particular, the presence
    of "xpti=" alone on the command line means nothing as to which default
    is to be overridden; "xpti=no-dom0", for example, ought to have no
    effect for DomU-s, as this is distinct from both "xpti=no-dom0,domu"
    and "xpti=no-dom0,no-domu".
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 xen/arch/x86/spec_ctrl.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c
index bee6b38598..b5e77bd161 100644
--- a/xen/arch/x86/spec_ctrl.c
+++ b/xen/arch/x86/spec_ctrl.c
@@ -232,12 +232,6 @@ static __init int parse_pv_l1tf(const char *s)
     const char *ss;
     int val, rc = 0;
 
-    /* Inhibit the defaults as an explicit choice has been given. */
-    if ( opt_pv_l1tf_hwdom == -1 )
-        opt_pv_l1tf_hwdom = 0;
-    if ( opt_pv_l1tf_domu == -1 )
-        opt_pv_l1tf_domu = 0;
-
     /* Interpret 'pv-l1tf' alone in its positive boolean form. */
     if ( *s == '\0' )
         opt_pv_l1tf_hwdom = opt_pv_l1tf_domu = 1;
@@ -699,12 +693,6 @@ static __init int parse_xpti(const char *s)
     const char *ss;
     int val, rc = 0;
 
-    /* Inhibit the defaults as an explicit choice has been given. */
-    if ( opt_xpti_hwdom == -1 )
-        opt_xpti_hwdom = 0;
-    if ( opt_xpti_domu == -1 )
-        opt_xpti_domu = 0;
-
     /* Interpret 'xpti' alone in its positive boolean form. */
     if ( *s == '\0' )
         opt_xpti_hwdom = opt_xpti_domu = 1;
--
generated by git-patchbot for /home/xen/git/xen.git#staging

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