From: Andrew Cooper Date: Tue, 25 Feb 2020 15:33:31 +0000 (+0000) Subject: x86/gen-cpuid: Distinguish default vs max in feature annotations X-Git-Tag: temptemp~10 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1accd92514f286c44e76f198f1bba90ad2e9e83b;p=people%2Fhx242%2Fxen.git x86/gen-cpuid: Distinguish default vs max in feature annotations 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 Reviewed-by: Jan Beulich Release-acked-by: Paul Durrant --- diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index 037954cfb8..ffd9529fdf 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -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.