Allow lowercase a/s/h to be used to annotate a non-default feature.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Wei Liu <wl@xen.org>
CC: Roger Pau Monné <roger.pau@citrix.com>
---
xen/include/public/arch-x86/cpufeatureset.h | 2 ++
xen/tools/gen-cpuid.py | 7 ++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h
index 086736ac7b..d79a53befe 100644
--- a/xen/include/public/arch-x86/cpufeatureset.h
+++ b/xen/include/public/arch-x86/cpufeatureset.h
@@ -87,6 +87,8 @@ enum {
* 'A' = All guests.
* 'S' = All HVM guests (not PV guests).
* 'H' = HVM HAP guests (not PV or HVM Shadow guests).
+ * Upper case => Available by default
+ * Lower case => Can be opted-in to, but not available by default.
*/
/* Intel-defined CPU features, CPUID level 0x00000001.edx, word 0 */
diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py
index af5610a5e6..c178e2470d 100755
--- a/xen/tools/gen-cpuid.py
+++ b/xen/tools/gen-cpuid.py
@@ -23,6 +23,7 @@ def __init__(self, input, output):
self.raw = {
'!': set(),
'A': set(), 'S': set(), 'H': set(),
+ 'a': set(), 's': set(), 'h': set(),
}
# State calculated
@@ -133,9 +134,9 @@ def crunch_numbers(state):
state.hvm_shadow_def = state.pv_def | state.raw['S']
state.hvm_hap_def = state.hvm_shadow_def | state.raw['H']
- state.pv_max = state.pv_def
- state.hvm_shadow_max = state.hvm_shadow_def
- state.hvm_hap_max = state.hvm_hap_def
+ state.pv_max = state.raw['A'] | state.raw['a']
+ state.hvm_shadow_max = state.pv_max | state.raw['S'] | state.raw['s']
+ state.hvm_hap_max = state.hvm_shadow_max | state.raw['H'] | state.raw['h']
#
# Feature dependency information.
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel