Usage was mixed.
Signed-off-by: Tim Wiederhake <twiederh@xxxxxxxxxx>
---
src/cpu_map/arm_vendors.xml | 24 ++---
src/cpu_map/index.xml | 140 +++++++++++++--------------
src/cpu_map/x86_Cooperlake.xml | 166 ++++++++++++++++-----------------
3 files changed, 165 insertions(+), 165 deletions(-)
diff --git a/src/cpu_map/arm_vendors.xml b/src/cpu_map/arm_vendors.xml
index 703c2112b1..ff799efcd7 100644
--- a/src/cpu_map/arm_vendors.xml
+++ b/src/cpu_map/arm_vendors.xml
@@ -1,14 +1,14 @@
<cpus>
- <vendor name="ARM" value="0x41"/>
- <vendor name="Broadcom" value="0x42"/>
- <vendor name="Cavium" value="0x43"/>
- <vendor name="DigitalEquipment" value="0x44"/>
- <vendor name="HiSilicon" value="0x48"/>
- <vendor name="Infineon" value="0x49"/>
- <vendor name="Freescale" value="0x4D"/>
- <vendor name="NVIDIA" value="0x4E"/>
- <vendor name="APM" value="0x50"/>
- <vendor name="Qualcomm" value="0x51"/>
- <vendor name="Marvell" value="0x56"/>
- <vendor name="Intel" value="0x69"/>
+ <vendor name='ARM' value='0x41'/>
+ <vendor name='Broadcom' value='0x42'/>
+ <vendor name='Cavium' value='0x43'/>
+ <vendor name='DigitalEquipment' value='0x44'/>
+ <vendor name='HiSilicon' value='0x48'/>
+ <vendor name='Infineon' value='0x49'/>
+ <vendor name='Freescale' value='0x4D'/>
+ <vendor name='NVIDIA' value='0x4E'/>
+ <vendor name='APM' value='0x50'/>
+ <vendor name='Qualcomm' value='0x51'/>
+ <vendor name='Marvell' value='0x56'/>
+ <vendor name='Intel' value='0x69'/>
</cpus>
diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index fec01f324c..08f052e7a0 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -1,99 +1,99 @@
<cpus>
<arch name='x86'>
- <include filename="x86_vendors.xml"/>
- <include filename="x86_features.xml"/>
+ <include filename='x86_vendors.xml'/>
+ <include filename='x86_features.xml'/>
<!-- models -->
- <include filename="x86_486.xml"/>
+ <include filename='x86_486.xml'/>
<!-- Intel-based QEMU generic CPU models -->
- <include filename="x86_pentium.xml"/>
- <include filename="x86_pentium2.xml"/>
- <include filename="x86_pentium3.xml"/>
- <include filename="x86_pentiumpro.xml"/>
- <include filename="x86_coreduo.xml"/>
- <include filename="x86_n270.xml"/>
- <include filename="x86_core2duo.xml"/>
+ <include filename='x86_pentium.xml'/>
+ <include filename='x86_pentium2.xml'/>
+ <include filename='x86_pentium3.xml'/>
+ <include filename='x86_pentiumpro.xml'/>
+ <include filename='x86_coreduo.xml'/>
+ <include filename='x86_n270.xml'/>
+ <include filename='x86_core2duo.xml'/>
<!-- Generic QEMU CPU models -->
- <include filename="x86_qemu32.xml"/>
- <include filename="x86_kvm32.xml"/>
- <include filename="x86_cpu64-rhel5.xml"/>
- <include filename="x86_cpu64-rhel6.xml"/>
- <include filename="x86_qemu64.xml"/>
- <include filename="x86_kvm64.xml"/>
+ <include filename='x86_qemu32.xml'/>
+ <include filename='x86_kvm32.xml'/>
+ <include filename='x86_cpu64-rhel5.xml'/>
+ <include filename='x86_cpu64-rhel6.xml'/>
+ <include filename='x86_qemu64.xml'/>
+ <include filename='x86_kvm64.xml'/>
<!-- Intel CPU models -->
- <include filename="x86_Conroe.xml"/>
- <include filename="x86_Penryn.xml"/>
- <include filename="x86_Nehalem.xml"/>
- <include filename="x86_Nehalem-IBRS.xml"/>
- <include filename="x86_Westmere.xml"/>
- <include filename="x86_Westmere-IBRS.xml"/>
- <include filename="x86_SandyBridge.xml"/>
- <include filename="x86_SandyBridge-IBRS.xml"/>
- <include filename="x86_IvyBridge.xml"/>
- <include filename="x86_IvyBridge-IBRS.xml"/>
- <include filename="x86_Haswell-noTSX.xml"/>
- <include filename="x86_Haswell-noTSX-IBRS.xml"/>
- <include filename="x86_Haswell.xml"/>
- <include filename="x86_Haswell-IBRS.xml"/>
- <include filename="x86_Broadwell-noTSX.xml"/>
- <include filename="x86_Broadwell-noTSX-IBRS.xml"/>
- <include filename="x86_Broadwell.xml"/>
- <include filename="x86_Broadwell-IBRS.xml"/>
- <include filename="x86_Skylake-Client.xml"/>
- <include filename="x86_Skylake-Client-IBRS.xml"/>
- <include filename="x86_Skylake-Client-noTSX-IBRS.xml"/>
- <include filename="x86_Skylake-Server.xml"/>
- <include filename="x86_Skylake-Server-IBRS.xml"/>
- <include filename="x86_Skylake-Server-noTSX-IBRS.xml"/>
- <include filename="x86_Cascadelake-Server.xml"/>
- <include filename="x86_Cascadelake-Server-noTSX.xml"/>
- <include filename="x86_Icelake-Client.xml"/>
- <include filename="x86_Icelake-Client-noTSX.xml"/>
- <include filename="x86_Icelake-Server.xml"/>
- <include filename="x86_Icelake-Server-noTSX.xml"/>
- <include filename="x86_Cooperlake.xml"/>
+ <include filename='x86_Conroe.xml'/>
+ <include filename='x86_Penryn.xml'/>
+ <include filename='x86_Nehalem.xml'/>
+ <include filename='x86_Nehalem-IBRS.xml'/>
+ <include filename='x86_Westmere.xml'/>
+ <include filename='x86_Westmere-IBRS.xml'/>
+ <include filename='x86_SandyBridge.xml'/>
+ <include filename='x86_SandyBridge-IBRS.xml'/>
+ <include filename='x86_IvyBridge.xml'/>
+ <include filename='x86_IvyBridge-IBRS.xml'/>
+ <include filename='x86_Haswell-noTSX.xml'/>
+ <include filename='x86_Haswell-noTSX-IBRS.xml'/>
+ <include filename='x86_Haswell.xml'/>
+ <include filename='x86_Haswell-IBRS.xml'/>
+ <include filename='x86_Broadwell-noTSX.xml'/>
+ <include filename='x86_Broadwell-noTSX-IBRS.xml'/>
+ <include filename='x86_Broadwell.xml'/>
+ <include filename='x86_Broadwell-IBRS.xml'/>
+ <include filename='x86_Skylake-Client.xml'/>
+ <include filename='x86_Skylake-Client-IBRS.xml'/>
+ <include filename='x86_Skylake-Client-noTSX-IBRS.xml'/>
+ <include filename='x86_Skylake-Server.xml'/>
+ <include filename='x86_Skylake-Server-IBRS.xml'/>
+ <include filename='x86_Skylake-Server-noTSX-IBRS.xml'/>
+ <include filename='x86_Cascadelake-Server.xml'/>
+ <include filename='x86_Cascadelake-Server-noTSX.xml'/>
+ <include filename='x86_Icelake-Client.xml'/>
+ <include filename='x86_Icelake-Client-noTSX.xml'/>
+ <include filename='x86_Icelake-Server.xml'/>
+ <include filename='x86_Icelake-Server-noTSX.xml'/>
+ <include filename='x86_Cooperlake.xml'/>
<!-- AMD CPUs -->
- <include filename="x86_athlon.xml"/>
- <include filename="x86_phenom.xml"/>
- <include filename="x86_Opteron_G1.xml"/>
- <include filename="x86_Opteron_G2.xml"/>
- <include filename="x86_Opteron_G3.xml"/>
- <include filename="x86_Opteron_G4.xml"/>
- <include filename="x86_Opteron_G5.xml"/>
- <include filename="x86_EPYC.xml"/>
- <include filename="x86_EPYC-IBPB.xml"/>
- <include filename="x86_EPYC-Rome.xml"/>
+ <include filename='x86_athlon.xml'/>
+ <include filename='x86_phenom.xml'/>
+ <include filename='x86_Opteron_G1.xml'/>
+ <include filename='x86_Opteron_G2.xml'/>
+ <include filename='x86_Opteron_G3.xml'/>
+ <include filename='x86_Opteron_G4.xml'/>
+ <include filename='x86_Opteron_G5.xml'/>
+ <include filename='x86_EPYC.xml'/>
+ <include filename='x86_EPYC-IBPB.xml'/>
+ <include filename='x86_EPYC-Rome.xml'/>
<!-- Hygon CPU models -->
- <include filename="x86_Dhyana.xml"/>
+ <include filename='x86_Dhyana.xml'/>
</arch>
<arch name='ppc64'>
- <include filename="ppc64_vendors.xml"/>
+ <include filename='ppc64_vendors.xml'/>
<!-- IBM-based CPU models -->
- <include filename="ppc64_POWER6.xml"/>
- <include filename="ppc64_POWER7.xml"/>
- <include filename="ppc64_POWER8.xml"/>
- <include filename="ppc64_POWER9.xml"/>
+ <include filename='ppc64_POWER6.xml'/>
+ <include filename='ppc64_POWER7.xml'/>
+ <include filename='ppc64_POWER8.xml'/>
+ <include filename='ppc64_POWER9.xml'/>
<!-- Freescale-based CPU models -->
- <include filename="ppc64_POWERPC_e5500.xml"/>
- <include filename="ppc64_POWERPC_e6500.xml"/>
+ <include filename='ppc64_POWERPC_e5500.xml'/>
+ <include filename='ppc64_POWERPC_e6500.xml'/>
</arch>
<arch name='arm'>
- <include filename="arm_vendors.xml"/>
+ <include filename='arm_vendors.xml'/>
<include filename='arm_features.xml'/>
<!-- ARM-based CPU models -->
- <include filename="arm_cortex-a53.xml"/>
- <include filename="arm_cortex-a57.xml"/>
- <include filename="arm_cortex-a72.xml"/>
+ <include filename='arm_cortex-a53.xml'/>
+ <include filename='arm_cortex-a57.xml'/>
+ <include filename='arm_cortex-a72.xml'/>
<!-- Qualcomm-based CPU models -->
<include filename='arm_Falkor.xml'/>
@@ -102,6 +102,6 @@
<include filename='arm_ThunderX299xx.xml'/>
<!-- Hisilicon-based CPU models -->
- <include filename="arm_Kunpeng-920.xml"/>
+ <include filename='arm_Kunpeng-920.xml'/>
</arch>
</cpus>
diff --git a/src/cpu_map/x86_Cooperlake.xml b/src/cpu_map/x86_Cooperlake.xml
index 41bd210638..ceca687334 100644
--- a/src/cpu_map/x86_Cooperlake.xml
+++ b/src/cpu_map/x86_Cooperlake.xml
@@ -3,88 +3,88 @@
<decode host='on' guest='on'/>
<signature family='6' model='85' stepping='10-11'/> <!-- 05065b -->
<vendor name='Intel'/>
- <feature name="3dnowprefetch"/>
- <feature name="abm"/>
- <feature name="adx"/>
- <feature name="aes"/>
- <feature name="apic"/>
- <feature name="arat"/>
- <feature name="arch-capabilities"/>
- <feature name="avx"/>
- <feature name="avx2"/>
- <feature name="avx512-bf16"/>
- <feature name="avx512bw"/>
- <feature name="avx512cd"/>
- <feature name="avx512dq"/>
- <feature name="avx512f"/>
- <feature name="avx512vl"/>
- <feature name="avx512vnni"/>
- <feature name="bmi1"/>
- <feature name="bmi2"/>
- <feature name="clflush"/>
- <feature name="clflushopt"/>
- <feature name="clwb"/>
- <feature name="cmov"/>
- <feature name="cx16"/>
- <feature name="cx8"/>
- <feature name="de"/>
- <feature name="erms"/>
- <feature name="f16c"/>
- <feature name="fma"/>
- <feature name="fpu"/>
- <feature name="fsgsbase"/>
- <feature name="fxsr"/>
- <feature name="hle"/>
- <feature name="ibrs-all"/>
- <feature name="invpcid"/>
- <feature name="lahf_lm"/>
- <feature name="lm"/>
- <feature name="mca"/>
- <feature name="mce"/>
- <feature name="mds-no"/>
- <feature name="mmx"/>
- <feature name="movbe"/>
- <feature name="msr"/>
- <feature name="mtrr"/>
- <feature name="nx"/>
- <feature name="pae"/>
- <feature name="pat"/>
- <feature name="pcid"/>
- <feature name="pclmuldq"/>
- <feature name="pdpe1gb"/>
- <feature name="pge"/>
- <feature name="pku"/>
- <feature name="pni"/>
- <feature name="popcnt"/>
- <feature name="pschange-mc-no"/>
- <feature name="pse"/>
- <feature name="pse36"/>
- <feature name="rdctl-no"/>
- <feature name="rdrand"/>
- <feature name="rdseed"/>
- <feature name="rdtscp"/>
- <feature name="rtm"/>
- <feature name="sep"/>
- <feature name="skip-l1dfl-vmentry"/>
- <feature name="smap"/>
- <feature name="smep"/>
- <feature name="spec-ctrl"/>
- <feature name="ssbd"/>
- <feature name="sse"/>
- <feature name="sse2"/>
- <feature name="sse4.1"/>
- <feature name="sse4.2"/>
- <feature name="ssse3"/>
- <feature name="stibp"/>
- <feature name="syscall"/>
- <feature name="taa-no"/>
- <feature name="tsc"/>
- <feature name="tsc-deadline"/>
- <feature name="vme"/>
- <feature name="x2apic"/>
- <feature name="xgetbv1"/>
- <feature name="xsave"/>
- <feature name="xsavec"/>
- <feature name="xsaveopt"/>
+ <feature name='3dnowprefetch'/>
+ <feature name='abm'/>
+ <feature name='adx'/>
+ <feature name='aes'/>
+ <feature name='apic'/>
+ <feature name='arat'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='bmi1'/>
+ <feature name='bmi2'/>
+ <feature name='clflush'/>
+ <feature name='clflushopt'/>
+ <feature name='clwb'/>
+ <feature name='cmov'/>
+ <feature name='cx16'/>
+ <feature name='cx8'/>
+ <feature name='de'/>
+ <feature name='erms'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='fpu'/>
+ <feature name='fsgsbase'/>
+ <feature name='fxsr'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='lahf_lm'/>
+ <feature name='lm'/>
+ <feature name='mca'/>
+ <feature name='mce'/>
+ <feature name='mds-no'/>
+ <feature name='mmx'/>
+ <feature name='movbe'/>
+ <feature name='msr'/>
+ <feature name='mtrr'/>
+ <feature name='nx'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pcid'/>
+ <feature name='pclmuldq'/>
+ <feature name='pdpe1gb'/>
+ <feature name='pge'/>
+ <feature name='pku'/>
+ <feature name='pni'/>
+ <feature name='popcnt'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='pse'/>
+ <feature name='pse36'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdrand'/>
+ <feature name='rdseed'/>
+ <feature name='rdtscp'/>
+ <feature name='rtm'/>
+ <feature name='sep'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='smap'/>
+ <feature name='smep'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='sse'/>
+ <feature name='sse2'/>
+ <feature name='sse4.1'/>
+ <feature name='sse4.2'/>
+ <feature name='ssse3'/>
+ <feature name='stibp'/>
+ <feature name='syscall'/>
+ <feature name='taa-no'/>
+ <feature name='tsc'/>
+ <feature name='tsc-deadline'/>
+ <feature name='vme'/>
+ <feature name='x2apic'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveopt'/>
</model>
</cpus>
--
2.26.2
