Andrew says "Given the AMD MSR_SPEC_CTRL series just posted, use of
CPUID bits will often be symmetrical and it's awkward to have one or
with a prefix and the other without." Let's drop the two prefixes of
this kind that we have.

Requested-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
v3: New.

--- a/tools/misc/xen-cpuid.c
+++ b/tools/misc/xen-cpuid.c
@@ -152,13 +152,13 @@ static const char *const str_e8b[32] =
     /* [ 8] */                 [ 9] = "wbnoinvd",
 
     [12] = "ibpb",
-    [14] = "ibrs",             [15] = "amd-stibp",
+    [14] = "ibrs",             [15] = "stibp",
     [16] = "ibrs-always",      [17] = "stibp-always",
     [18] = "ibrs-fast",        [19] = "ibrs-same-mode",
 
     [20] = "no-lmsl",
     /* [22] */                 [23] = "ppin",
-    [24] = "amd-ssbd",         [25] = "virt-ssbd",
+    [24] = "ssbd",             [25] = "virt-ssbd",
     [26] = "ssb-no",
     [28] = "psfd",
 };