From: Jan Beulich Date: Mon, 5 Nov 2018 15:13:09 +0000 (+0100) Subject: x86: silence false log messages for plain "xpti" / "pv-l1tf" X-Git-Tag: RELEASE-4.8.5~20 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bd89569fb525ec957beb798ec99a2bb77de6bc94;p=xen.git x86: silence false log messages for plain "xpti" / "pv-l1tf" While commit 2a3b34ec47 ("x86/spec-ctrl: Yet more fixes for xpti= parsing") claimed to have got rid of the 'parameter "xpti" has invalid value "", rc=-22!' log message for "xpti" alone on the command line, this wasn't the case (the option took effect nevertheless). Fix this there as well as for plain "pv-l1tf". Signed-off-by: Jan Beulich Acked-by: Andrew Cooper master commit: 2fb57e4beefeda923446b73f88b392e59b07d847 master date: 2018-09-28 17:12:14 +0200 --- diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 3adaaea9cf..559f2bd806 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -239,7 +239,7 @@ static __init int parse_pv_l1tf(char *s) else if ( (val = parse_boolean("domu", s, ss)) >= 0 ) opt_pv_l1tf = ((opt_pv_l1tf & ~OPT_PV_L1TF_DOMU) | (val ? OPT_PV_L1TF_DOMU : 0)); - else + else if ( *s ) rc = -EINVAL; break; } @@ -690,7 +690,7 @@ static __init int parse_xpti(char *s) else if ( (val = parse_boolean("domu", s, ss)) >= 0 ) opt_xpti = (opt_xpti & ~OPT_XPTI_DOMU) | (val ? OPT_XPTI_DOMU : 0); - else + else if ( *s ) rc = -EINVAL; break; }