Failed in applying to current master (
apply log)
docs/misc/xen-command-line.pandoc | 25 +++++--
tools/libs/light/libxl_cpuid.c | 2 +
tools/misc/xen-cpuid.c | 6 ++
tools/tests/tsx/test-tsx.c | 9 ++-
xen/arch/x86/acpi/power.c | 3 +-
xen/arch/x86/cpu/common.c | 4 ++
xen/arch/x86/cpu/intel.c | 32 +++++++++
xen/arch/x86/include/asm/cpufeature.h | 1 +
xen/arch/x86/include/asm/msr-index.h | 2 +
xen/arch/x86/include/asm/processor.h | 3 +
xen/arch/x86/include/asm/spec_ctrl.h | 2 -
xen/arch/x86/msr.c | 2 +-
xen/arch/x86/platform_hypercall.c | 3 +
xen/arch/x86/smpboot.c | 3 +-
xen/arch/x86/spec_ctrl.c | 52 +++++++-------
xen/arch/x86/tsx.c | 102 ++++++++++++++++++++++++----
xen/include/public/arch-x86/cpufeatureset.h | 3 +
xen/include/xen/lib/x86/cpuid.h | 13 +++-
xen/tools/gen-cpuid.py | 2 +-
19 files changed, 211 insertions(+), 58 deletions(-)