From: Jan Beulich Date: Mon, 5 Nov 2018 14:19:54 +0000 (+0100) Subject: x86: fix "xpti=" and "pv-l1tf=" yet again X-Git-Tag: RELEASE-4.9.4~36 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d635520b6fa60566bc6cc1f7ac02c21155676168;p=xen.git 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 Acked-by: Andrew Cooper master commit: 8743d2dea539617e237c77556a91dc357098a8af master date: 2018-10-04 14:49:56 +0200 --- diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 6cb0c13d66..25da6a2e95 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -214,12 +214,6 @@ static __init int parse_pv_l1tf(char *s) 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; @@ -674,12 +668,6 @@ static __init int parse_xpti(char *s) 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;