@@ -130,17 +130,13 @@ def crunch_numbers(state):
MTRR, PGE, MCA, CMOV, PAT, PSE36, MMX, FXSR)
state.common_1d = common_1d
- state.pv_def = state.raw['A']
- state.hvm_shadow_def = state.pv_def | state.raw['S']
- state.hvm_hap_def = state.hvm_shadow_def | state.raw['H']
-
- # TODO: Ignore def/max split until the toolstack migration logic is fixed
- 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']
+ state.pv_def = state.raw['A']
+ 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.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.
The toolstack logic can now correctly distinguish a clean boot from a migrate/restore. Allow lowercase a/s/h to be used to annotate a non-default feature. Due to the emulator work prepared earlier in 4.14, this now allows VMs to explicity opt in to the TSXLDTRK, MOVDIR{I,64B} and SERIALIZE instructions via their xl.cfg file, rather than getting them as a matter of default. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Reviewed-by: Jan Beulich <jbeulich@suse.com> --- CC: Jan Beulich <JBeulich@suse.com> CC: Wei Liu <wl@xen.org> CC: Roger Pau Monné <roger.pau@citrix.com> CC: Ian Jackson <Ian.Jackson@citrix.com> CC: Wei Liu <wl@xen.org> CC: Paul Durrant <paul@xen.org> --- xen/tools/gen-cpuid.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)