From: Jan Beulich <jbeulich@suse.com>
Date: Wed, 2 Oct 2019 11:38:02 +0000 (+0200)
Subject: tools/xen-cpuid: avoid producing bogus output
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2c9e748729b97795d1b0292e7f6422e3bc327ce0;p=people%2Flarsk%2Fxen.git

tools/xen-cpuid: avoid producing bogus output

I was (mistakenly, as - looking at the code - it's clearly not intended
to work) passing the tool "Raw" and "Host" as command line arguments.
Avoid printing just "Raw       " with not even a newline at the end in
such a case. Instead report what wasn't understood by the parsing logic.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Wei Liu <wl@xen.org>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
Release-acked-by: Juergen Gross <jgross@suse.com>
---

diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c
index f51facffb6..866c556a0f 100644
--- a/tools/misc/xen-cpuid.c
+++ b/tools/misc/xen-cpuid.c
@@ -530,6 +530,15 @@ int main(int argc, char **argv)
                 break;
             }
 
+            if ( !i )
+            {
+                fprintf(stderr, "'%s' unrecognized - skipping\n", ptr);
+                continue;
+            }
+
+            if ( *ptr )
+                fprintf(stderr, "'%s' unrecognized - ignoring\n", ptr);
+
             decode_featureset(fs, i, "Raw", true);
         }
     }