4:08 p.m.
These were introduced in 1d946ac794 in an attempt to make this
information usable for libvirt. This did not work out and has
been unused since. Remove from x86_features.xml as this data
is preserved in the feature name translation tables in
sync_qemu_features_i386.py.
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
---
src/cpu/cpu_x86.c | 5 -----
src/cpu_map/x86_features.xml | 26 --------------------------
2 files changed, 31 deletions(-)
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 6b2531b360..7516941701 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -1099,11 +1099,6 @@ x86ParseDataItemList(virCPUx86Data *cpudata,
while (node) {
virCPUx86DataItem item;
- if (virXMLNodeNameEqual(node, "alias")) {
- node = xmlNextElementSibling(node);
- continue;
- }
-
if (virXMLNodeNameEqual(node, "cpuid")) {
if (x86ParseCPUID(node, &item) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index 8d1dbe68e8..60c952223a 100644
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -8,11 +8,9 @@
<!-- cpuid level 0x00000001 (ecx) -->
<feature name='pni'>
- <alias name='sse3' source='qemu'/>
<cpuid eax_in='0x00000001' ecx='0x00000001'/>
</feature>
<feature name='pclmuldq'>
- <alias name='pclmulqdq' source='qemu'/>
<cpuid eax_in='0x00000001' ecx='0x00000002'/>
</feature>
<feature name='dtes64'>
@@ -22,7 +20,6 @@
<cpuid eax_in='0x00000001' ecx='0x00000008'/>
</feature>
<feature name='ds_cpl'>
- <alias name='ds-cpl' source='qemu'/>
<cpuid eax_in='0x00000001' ecx='0x00000010'/>
</feature>
<feature name='vmx'>
@@ -62,13 +59,9 @@
<cpuid eax_in='0x00000001' ecx='0x00040000'/>
</feature>
<feature name='sse4.1'>
- <alias name='sse4-1' source='qemu'/>
- <alias name='sse4_1' source='qemu'/>
<cpuid eax_in='0x00000001' ecx='0x00080000'/>
</feature>
<feature name='sse4.2'>
- <alias name='sse4-2' source='qemu'/>
- <alias name='sse4_2' source='qemu'/>
<cpuid eax_in='0x00000001' ecx='0x00100000'/>
</feature>
<feature name='x2apic'>
@@ -207,7 +200,6 @@
<cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00000001'/>
</feature>
<feature name='tsc_adjust'>
- <alias name='tsc-adjust' source='qemu'/>
<cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00000002'/>
</feature>
<feature name='sgx'>
@@ -238,7 +230,6 @@
<cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00000800'/>
</feature>
<feature name='cmt'>
- <alias name='cqm' source='linux'/>
<cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00001000'/>
</feature>
<feature name='mpx'>
@@ -369,7 +360,6 @@
<cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x00000100'/>
</feature>
<feature name='md-clear'>
- <alias name='md_clear' source='linux'/>
<cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x00000400'/>
</feature>
<feature name='serialize'>
@@ -406,7 +396,6 @@
<cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x10000000'/>
</feature>
<feature name='arch-capabilities'>
- <alias name='arch_capabilities' source='linux'/>
<cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x20000000'/>
</feature>
<feature name='core-capability'>
@@ -529,11 +518,9 @@
<!-- cpuid level 0x80000001 (ecx) -->
<feature name='lahf_lm'>
- <alias name='lahf-lm' source='qemu'/>
<cpuid eax_in='0x80000001' ecx='0x00000001'/>
</feature>
<feature name='cmp_legacy'>
- <alias name='cmp-legacy' source='qemu'/>
<cpuid eax_in='0x80000001' ecx='0x00000002'/>
</feature>
<feature name='svm'>
@@ -585,7 +572,6 @@
<cpuid eax_in='0x80000001' ecx='0x00040000'/>
</feature>
<feature name='nodeid_msr'>
- <alias name='nodeid-msr' source='qemu'/>
<cpuid eax_in='0x80000001' ecx='0x00080000'/>
</feature>
<feature name='tbm'>
@@ -595,11 +581,9 @@
<cpuid eax_in='0x80000001' ecx='0x00400000'/>
</feature>
<feature name='perfctr_core'>
- <alias name='perfctr-core' source='qemu'/>
<cpuid eax_in='0x80000001' ecx='0x00800000'/>
</feature>
<feature name='perfctr_nb'>
- <alias name='perfctr-nb' source='qemu'/>
<cpuid eax_in='0x80000001' ecx='0x01000000'/>
</feature>
@@ -608,15 +592,12 @@
<cpuid eax_in='0x80000001' edx='0x00000800'/>
</feature>
<feature name='nx'>
- <alias name='xd' source='qemu'/>
<cpuid eax_in='0x80000001' edx='0x00100000'/>
</feature>
<feature name='mmxext'>
<cpuid eax_in='0x80000001' edx='0x00400000'/>
</feature>
<feature name='fxsr_opt'>
- <alias name='ffxsr' source='qemu'/>
- <alias name='fxsr-opt' source='qemu'/>
<cpuid eax_in='0x80000001' edx='0x02000000'/>
</feature>
<feature name='pdpe1gb'>
@@ -626,7 +607,6 @@
<cpuid eax_in='0x80000001' edx='0x08000000'/>
</feature>
<feature name='lm'>
- <alias name='i64' source='qemu'/>
<cpuid eax_in='0x80000001' edx='0x20000000'/>
</feature>
<feature name='3dnowext'>
@@ -684,19 +664,15 @@
<cpuid eax_in='0x8000000a' edx='0x00000002'/>
</feature>
<feature name='svm-lock'>
- <alias name='svm_lock' source='qemu'/>
<cpuid eax_in='0x8000000a' edx='0x00000004'/>
</feature>
<feature name='nrip-save'>
- <alias name='nrip_save' source='qemu'/>
<cpuid eax_in='0x8000000a' edx='0x00000008'/>
</feature>
<feature name='tsc-scale'>
- <alias name='tsc_scale' source='qemu'/>
<cpuid eax_in='0x8000000a' edx='0x00000010'/>
</feature>
<feature name='vmcb-clean'>
- <alias name='vmcb_clean' source='qemu'/>
<cpuid eax_in='0x8000000a' edx='0x00000020'/>
</feature>
<feature name='flushbyasid'>
@@ -706,7 +682,6 @@
<cpuid eax_in='0x8000000a' edx='0x00000080'/>
</feature>
<feature name='pause-filter'>
- <alias name='pause_filter' source='qemu'/>
<cpuid eax_in='0x8000000a' edx='0x00000400'/>
</feature>
<feature name='pfthreshold'>
@@ -940,7 +915,6 @@
<msr index='0x0000048c' edx='0x00000400'
eax='0x00000000'/>
</feature>
<feature name='vmx-invvpid-single-context-noglobals'>
- <alias name='vmx-invept-single-context-noglobals'
source='qemu'/>
<msr index='0x0000048c' edx='0x00000800'
eax='0x00000000'/>
</feature>
--
2.43.0