From: Jiri Denemark <jdenemar@redhat.com> Signed-off-by: Jiri Denemark <jdenemar@redhat.com> --- src/cpu_map/sync_qemu_features_i386.py | 11 --------- src/cpu_map/sync_qemu_models_i386.py | 10 ++++++++ src/cpu_map/x86_features.xml | 32 ++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 11 deletions(-) diff --git a/src/cpu_map/sync_qemu_features_i386.py b/src/cpu_map/sync_qemu_features_i386.py index 21df37e9d6..b658b864f2 100755 --- a/src/cpu_map/sync_qemu_features_i386.py +++ b/src/cpu_map/sync_qemu_features_i386.py @@ -30,17 +30,6 @@ FEATURES_IGNORE = ( "kvmclock-stable-bit", "kvmclock2", - "xstore", - "xstore-en", - "xcrypt", - "xcrypt-en", - "ace2", - "ace2-en", - "phe", - "phe-en", - "pmm", - "pmm-en", - "full-width-write", ) diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_models_i386.py index 2b66c2522f..20d2b36844 100755 --- a/src/cpu_map/sync_qemu_models_i386.py +++ b/src/cpu_map/sync_qemu_models_i386.py @@ -136,6 +136,16 @@ def translate_feature(name, model): "CPUID_8000_0021_EAX_IBPB_BRTYPE": "ibpb-brtype", "CPUID_8000_0021_EAX_SRSO_USER_KERNEL_NO": "srso-user-kernel-no", "CPUID_8000_0022_EAX_PERFMON_V2": "perfmon-v2", + "CPUID_C000_0001_EDX_XSTORE": "xstore", + "CPUID_C000_0001_EDX_XSTORE_EN": "xstore-en", + "CPUID_C000_0001_EDX_XCRYPT": "xcrypt", + "CPUID_C000_0001_EDX_XCRYPT_EN": "xcrypt-en", + "CPUID_C000_0001_EDX_ACE2": "ace2", + "CPUID_C000_0001_EDX_ACE2_EN": "ace2-en", + "CPUID_C000_0001_EDX_PHE": "phe", + "CPUID_C000_0001_EDX_PHE_EN": "phe-en", + "CPUID_C000_0001_EDX_PMM": "pmm", + "CPUID_C000_0001_EDX_PMM_EN": "pmm-en", "CPUID_ACPI": "acpi", "CPUID_APIC": "apic", "CPUID_CLFLUSH": "clflush", diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml index 06391f4698..5220a3d172 100644 --- a/src/cpu_map/x86_features.xml +++ b/src/cpu_map/x86_features.xml @@ -850,6 +850,38 @@ <cpuid eax_in='0x80000022' eax='0x00000001'/> </feature> + <!-- cpuid level 0xc0000001 (edx) --> + <feature name='xstore'> + <cpuid eax_in='0xc0000001' edx='0x00000004'/> + </feature> + <feature name='xstore-en'> + <cpuid eax_in='0xc0000001' edx='0x00000008'/> + </feature> + <feature name='xcrypt'> + <cpuid eax_in='0xc0000001' edx='0x00000040'/> + </feature> + <feature name='xcrypt-en'> + <cpuid eax_in='0xc0000001' edx='0x00000080'/> + </feature> + <feature name='ace2'> + <cpuid eax_in='0xc0000001' edx='0x00000100'/> + </feature> + <feature name='ace2-en'> + <cpuid eax_in='0xc0000001' edx='0x00000200'/> + </feature> + <feature name='phe'> + <cpuid eax_in='0xc0000001' edx='0x00000400'/> + </feature> + <feature name='phe-en'> + <cpuid eax_in='0xc0000001' edx='0x00000800'/> + </feature> + <feature name='pmm'> + <cpuid eax_in='0xc0000001' edx='0x00001000'/> + </feature> + <feature name='pmm-en'> + <cpuid eax_in='0xc0000001' edx='0x00002000'/> + </feature> + <!-- msr 0x000000cf --> <feature name='split-lock-detect'> <msr index='0x000000cf' edx='0x00000000' eax='0x00000020'/> -- 2.51.0