[libvirt PATCH 1/3] cpu_map: Unify apostrophe and quotation mark usage

[Tim Wiederhake <twiederh@xxxxxxxxxx>]

Usage was mixed. For doc/schema/*.rng we switched to quotation marks
in commit 0e907b8216b42a7c6cfa826e1df539ae513cc3a9. Follow suit.

Signed-off-by: Tim Wiederhake <twiederh@xxxxxxxxxx>
---
 src/cpu_map/arm_Falkor.xml                    |   6 +-
 src/cpu_map/arm_Kunpeng-920.xml               |   6 +-
 src/cpu_map/arm_ThunderX299xx.xml             |   6 +-
 src/cpu_map/arm_cortex-a53.xml                |   6 +-
 src/cpu_map/arm_cortex-a57.xml                |   6 +-
 src/cpu_map/arm_cortex-a72.xml                |   6 +-
 src/cpu_map/arm_features.xml                  |  34 +-
 src/cpu_map/index.xml                         |  12 +-
 src/cpu_map/ppc64_POWER6.xml                  |   6 +-
 src/cpu_map/ppc64_POWER7.xml                  |   8 +-
 src/cpu_map/ppc64_POWER8.xml                  |  10 +-
 src/cpu_map/ppc64_POWER9.xml                  |   6 +-
 src/cpu_map/ppc64_POWERPC_e5500.xml           |   6 +-
 src/cpu_map/ppc64_POWERPC_e6500.xml           |   6 +-
 src/cpu_map/ppc64_vendors.xml                 |   4 +-
 src/cpu_map/x86_486.xml                       |  10 +-
 src/cpu_map/x86_Broadwell-IBRS.xml            | 124 +--
 src/cpu_map/x86_Broadwell-noTSX-IBRS.xml      | 120 +--
 src/cpu_map/x86_Broadwell-noTSX.xml           | 118 +--
 src/cpu_map/x86_Broadwell.xml                 | 122 +--
 src/cpu_map/x86_Cascadelake-Server-noTSX.xml  | 152 ++--
 src/cpu_map/x86_Cascadelake-Server.xml        | 156 ++--
 src/cpu_map/x86_Conroe.xml                    |  64 +-
 src/cpu_map/x86_Cooperlake.xml                |   8 +-
 src/cpu_map/x86_Dhyana.xml                    | 136 ++--
 src/cpu_map/x86_EPYC-IBPB.xml                 | 142 ++--
 src/cpu_map/x86_EPYC-Rome.xml                 | 160 ++--
 src/cpu_map/x86_EPYC.xml                      | 140 ++--
 src/cpu_map/x86_Haswell-IBRS.xml              | 116 +--
 src/cpu_map/x86_Haswell-noTSX-IBRS.xml        | 112 +--
 src/cpu_map/x86_Haswell-noTSX.xml             | 110 +--
 src/cpu_map/x86_Haswell.xml                   | 114 +--
 src/cpu_map/x86_Icelake-Client-noTSX.xml      | 158 ++--
 src/cpu_map/x86_Icelake-Client.xml            | 162 ++--
 src/cpu_map/x86_Icelake-Server-noTSX.xml      | 176 ++---
 src/cpu_map/x86_Icelake-Server.xml            | 180 ++---
 src/cpu_map/x86_IvyBridge-IBRS.xml            | 100 +--
 src/cpu_map/x86_IvyBridge.xml                 |  98 +--
 src/cpu_map/x86_Nehalem-IBRS.xml              |  78 +-
 src/cpu_map/x86_Nehalem.xml                   |  76 +-
 src/cpu_map/x86_Opteron_G1.xml                |  58 +-
 src/cpu_map/x86_Opteron_G2.xml                |  66 +-
 src/cpu_map/x86_Opteron_G3.xml                |  76 +-
 src/cpu_map/x86_Opteron_G4.xml                |  96 +--
 src/cpu_map/x86_Opteron_G5.xml                | 102 +--
 src/cpu_map/x86_Penryn.xml                    |  68 +-
 src/cpu_map/x86_SandyBridge-IBRS.xml          |  88 +--
 src/cpu_map/x86_SandyBridge.xml               |  86 +--
 src/cpu_map/x86_Skylake-Client-IBRS.xml       | 142 ++--
 src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml | 138 ++--
 src/cpu_map/x86_Skylake-Client.xml            | 140 ++--
 src/cpu_map/x86_Skylake-Server-IBRS.xml       | 150 ++--
 src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml | 146 ++--
 src/cpu_map/x86_Skylake-Server.xml            | 148 ++--
 src/cpu_map/x86_Westmere-IBRS.xml             |  74 +-
 src/cpu_map/x86_Westmere.xml                  |  76 +-
 src/cpu_map/x86_athlon.xml                    |  52 +-
 src/cpu_map/x86_core2duo.xml                  |  62 +-
 src/cpu_map/x86_coreduo.xml                   |  54 +-
 src/cpu_map/x86_cpu64-rhel5.xml               |  54 +-
 src/cpu_map/x86_cpu64-rhel6.xml               |  58 +-
 src/cpu_map/x86_features.xml                  | 724 +++++++++---------
 src/cpu_map/x86_kvm32.xml                     |  48 +-
 src/cpu_map/x86_kvm64.xml                     |  56 +-
 src/cpu_map/x86_n270.xml                      |  56 +-
 src/cpu_map/x86_pentium.xml                   |  22 +-
 src/cpu_map/x86_pentium2.xml                  |  40 +-
 src/cpu_map/x86_pentium3.xml                  |  42 +-
 src/cpu_map/x86_pentiumpro.xml                |  38 +-
 src/cpu_map/x86_phenom.xml                    |  68 +-
 src/cpu_map/x86_qemu32.xml                    |  40 +-
 src/cpu_map/x86_qemu64.xml                    |  66 +-
 src/cpu_map/x86_vendors.xml                   |   6 +-
 73 files changed, 3100 insertions(+), 3100 deletions(-)

diff --git a/src/cpu_map/arm_Falkor.xml b/src/cpu_map/arm_Falkor.xml
index b8f34bbc02..1a924d686c 100644
--- a/src/cpu_map/arm_Falkor.xml
+++ b/src/cpu_map/arm_Falkor.xml
@@ -1,6 +1,6 @@
 <cpus>
-  <model name='Falkor'>
-    <vendor name='Qualcomm'/>
-    <pvr value='0xc00'/>
+  <model name="Falkor">
+    <vendor name="Qualcomm"/>
+    <pvr value="0xc00"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/arm_Kunpeng-920.xml b/src/cpu_map/arm_Kunpeng-920.xml
index e06d4744fc..e925888f09 100644
--- a/src/cpu_map/arm_Kunpeng-920.xml
+++ b/src/cpu_map/arm_Kunpeng-920.xml
@@ -1,6 +1,6 @@
 <cpus>
-  <model name='Kunpeng-920'>
-    <vendor name='HiSilicon'/>
-    <pvr value='0xd01'/>
+  <model name="Kunpeng-920">
+    <vendor name="HiSilicon"/>
+    <pvr value="0xd01"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/arm_ThunderX299xx.xml b/src/cpu_map/arm_ThunderX299xx.xml
index 6c0864f601..38ba4eb45c 100644
--- a/src/cpu_map/arm_ThunderX299xx.xml
+++ b/src/cpu_map/arm_ThunderX299xx.xml
@@ -1,6 +1,6 @@
 <cpus>
-  <model name='ThunderX2 99xx'>
-    <vendor name='Cavium'/>
-    <pvr value='0x0af'/>
+  <model name="ThunderX2 99xx">
+    <vendor name="Cavium"/>
+    <pvr value="0x0af"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/arm_cortex-a53.xml b/src/cpu_map/arm_cortex-a53.xml
index 3580236253..7aab9e1936 100644
--- a/src/cpu_map/arm_cortex-a53.xml
+++ b/src/cpu_map/arm_cortex-a53.xml
@@ -1,6 +1,6 @@
 <cpus>
-  <model name='cortex-a53'>
-    <vendor name='ARM'/>
-    <pvr value='0xd03'/>
+  <model name="cortex-a53">
+    <vendor name="ARM"/>
+    <pvr value="0xd03"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/arm_cortex-a57.xml b/src/cpu_map/arm_cortex-a57.xml
index 3bc4324173..3002613336 100644
--- a/src/cpu_map/arm_cortex-a57.xml
+++ b/src/cpu_map/arm_cortex-a57.xml
@@ -1,6 +1,6 @@
 <cpus>
-  <model name='cortex-a57'>
-    <vendor name='ARM'/>
-    <pvr value='0xd07'/>
+  <model name="cortex-a57">
+    <vendor name="ARM"/>
+    <pvr value="0xd07"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/arm_cortex-a72.xml b/src/cpu_map/arm_cortex-a72.xml
index c509a40567..16d5b89b8a 100644
--- a/src/cpu_map/arm_cortex-a72.xml
+++ b/src/cpu_map/arm_cortex-a72.xml
@@ -1,6 +1,6 @@
 <cpus>
-  <model name='cortex-a72'>
-    <vendor name='ARM'/>
-    <pvr value='0xd08'/>
+  <model name="cortex-a72">
+    <vendor name="ARM"/>
+    <pvr value="0xd08"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/arm_features.xml b/src/cpu_map/arm_features.xml
index 8a53384463..8eb71e2894 100644
--- a/src/cpu_map/arm_features.xml
+++ b/src/cpu_map/arm_features.xml
@@ -1,22 +1,22 @@
 <cpus>
 
   <!-- SVE vector lengths -->
-  <feature name='sve'/>
-  <feature name='sve128'/>
-  <feature name='sve256'/>
-  <feature name='sve384'/>
-  <feature name='sve512'/>
-  <feature name='sve640'/>
-  <feature name='sve768'/>
-  <feature name='sve896'/>
-  <feature name='sve1024'/>
-  <feature name='sve1152'/>
-  <feature name='sve1280'/>
-  <feature name='sve1408'/>
-  <feature name='sve1536'/>
-  <feature name='sve1664'/>
-  <feature name='sve1792'/>
-  <feature name='sve1920'/>
-  <feature name='sve2048'/>
+  <feature name="sve"/>
+  <feature name="sve128"/>
+  <feature name="sve256"/>
+  <feature name="sve384"/>
+  <feature name="sve512"/>
+  <feature name="sve640"/>
+  <feature name="sve768"/>
+  <feature name="sve896"/>
+  <feature name="sve1024"/>
+  <feature name="sve1152"/>
+  <feature name="sve1280"/>
+  <feature name="sve1408"/>
+  <feature name="sve1536"/>
+  <feature name="sve1664"/>
+  <feature name="sve1792"/>
+  <feature name="sve1920"/>
+  <feature name="sve2048"/>
 
 </cpus>
diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index fec01f324c..93c553ecc2 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -1,5 +1,5 @@
 <cpus>
-  <arch name='x86'>
+  <arch name="x86">
     <include filename="x86_vendors.xml"/>
     <include filename="x86_features.xml"/>
 
@@ -72,7 +72,7 @@
     <include filename="x86_Dhyana.xml"/>
   </arch>
 
-  <arch name='ppc64'>
+  <arch name="ppc64">
     <include filename="ppc64_vendors.xml"/>
 
     <!-- IBM-based CPU models -->
@@ -86,9 +86,9 @@
     <include filename="ppc64_POWERPC_e6500.xml"/>
   </arch>
 
-  <arch name='arm'>
+  <arch name="arm">
     <include filename="arm_vendors.xml"/>
-    <include filename='arm_features.xml'/>
+    <include filename="arm_features.xml"/>
 
     <!-- ARM-based CPU models -->
     <include filename="arm_cortex-a53.xml"/>
@@ -96,10 +96,10 @@
     <include filename="arm_cortex-a72.xml"/>
 
     <!-- Qualcomm-based CPU models -->
-    <include filename='arm_Falkor.xml'/>
+    <include filename="arm_Falkor.xml"/>
 
     <!-- Cavium-based CPU models -->
-    <include filename='arm_ThunderX299xx.xml'/>
+    <include filename="arm_ThunderX299xx.xml"/>
 
     <!-- Hisilicon-based CPU models -->
     <include filename="arm_Kunpeng-920.xml"/>
diff --git a/src/cpu_map/ppc64_POWER6.xml b/src/cpu_map/ppc64_POWER6.xml
index 00e27495f4..9c16a99b0d 100644
--- a/src/cpu_map/ppc64_POWER6.xml
+++ b/src/cpu_map/ppc64_POWER6.xml
@@ -1,6 +1,6 @@
 <cpus>
-  <model name='POWER6'>
-    <vendor name='IBM'/>
-    <pvr value='0x003e0000' mask='0xffff0000'/>
+  <model name="POWER6">
+    <vendor name="IBM"/>
+    <pvr value="0x003e0000" mask="0xffff0000"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/ppc64_POWER7.xml b/src/cpu_map/ppc64_POWER7.xml
index a071481805..5a858edd5d 100644
--- a/src/cpu_map/ppc64_POWER7.xml
+++ b/src/cpu_map/ppc64_POWER7.xml
@@ -1,7 +1,7 @@
 <cpus>
-  <model name='POWER7'>
-    <vendor name='IBM'/>
-    <pvr value='0x003f0000' mask='0xffff0000'/>
-    <pvr value='0x004a0000' mask='0xffff0000'/>
+  <model name="POWER7">
+    <vendor name="IBM"/>
+    <pvr value="0x003f0000" mask="0xffff0000"/>
+    <pvr value="0x004a0000" mask="0xffff0000"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/ppc64_POWER8.xml b/src/cpu_map/ppc64_POWER8.xml
index 64d96fc4c4..73c494479d 100644
--- a/src/cpu_map/ppc64_POWER8.xml
+++ b/src/cpu_map/ppc64_POWER8.xml
@@ -1,8 +1,8 @@
 <cpus>
-  <model name='POWER8'>
-    <vendor name='IBM'/>
-    <pvr value='0x004b0000' mask='0xffff0000'/>
-    <pvr value='0x004c0000' mask='0xffff0000'/>
-    <pvr value='0x004d0000' mask='0xffff0000'/>
+  <model name="POWER8">
+    <vendor name="IBM"/>
+    <pvr value="0x004b0000" mask="0xffff0000"/>
+    <pvr value="0x004c0000" mask="0xffff0000"/>
+    <pvr value="0x004d0000" mask="0xffff0000"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/ppc64_POWER9.xml b/src/cpu_map/ppc64_POWER9.xml
index 149fcde924..9a4f724965 100644
--- a/src/cpu_map/ppc64_POWER9.xml
+++ b/src/cpu_map/ppc64_POWER9.xml
@@ -1,6 +1,6 @@
 <cpus>
-  <model name='POWER9'>
-    <vendor name='IBM'/>
-    <pvr value='0x004e0000' mask='0xffff0000'/>
+  <model name="POWER9">
+    <vendor name="IBM"/>
+    <pvr value="0x004e0000" mask="0xffff0000"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/ppc64_POWERPC_e5500.xml b/src/cpu_map/ppc64_POWERPC_e5500.xml
index 3d64c8926c..ae2313bb9f 100644
--- a/src/cpu_map/ppc64_POWERPC_e5500.xml
+++ b/src/cpu_map/ppc64_POWERPC_e5500.xml
@@ -1,6 +1,6 @@
 <cpus>
-  <model name='POWERPC_e5500'>
-    <vendor name='Freescale'/>
-    <pvr value='0x80240000' mask='0xffff0000'/>
+  <model name="POWERPC_e5500">
+    <vendor name="Freescale"/>
+    <pvr value="0x80240000" mask="0xffff0000"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/ppc64_POWERPC_e6500.xml b/src/cpu_map/ppc64_POWERPC_e6500.xml
index b0d1006076..86d7c5846d 100644
--- a/src/cpu_map/ppc64_POWERPC_e6500.xml
+++ b/src/cpu_map/ppc64_POWERPC_e6500.xml
@@ -1,6 +1,6 @@
 <cpus>
-  <model name='POWERPC_e6500'>
-    <vendor name='Freescale'/>
-      <pvr value='0x80400000' mask='0xffff0000'/>
+  <model name="POWERPC_e6500">
+    <vendor name="Freescale"/>
+      <pvr value="0x80400000" mask="0xffff0000"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/ppc64_vendors.xml b/src/cpu_map/ppc64_vendors.xml
index 52ad45c0bd..fc248a642e 100644
--- a/src/cpu_map/ppc64_vendors.xml
+++ b/src/cpu_map/ppc64_vendors.xml
@@ -1,4 +1,4 @@
 <cpus>
-  <vendor name='IBM'/>
-  <vendor name='Freescale'/>
+  <vendor name="IBM"/>
+  <vendor name="Freescale"/>
 </cpus>
diff --git a/src/cpu_map/x86_486.xml b/src/cpu_map/x86_486.xml
index d05b277392..afc56dacae 100644
--- a/src/cpu_map/x86_486.xml
+++ b/src/cpu_map/x86_486.xml
@@ -1,8 +1,8 @@
 <cpus>
-  <model name='486'>
-    <decode host='on' guest='on'/>
-    <feature name='fpu'/>
-    <feature name='pse'/>
-    <feature name='vme'/>
+  <model name="486">
+    <decode host="on" guest="on"/>
+    <feature name="fpu"/>
+    <feature name="pse"/>
+    <feature name="vme"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Broadwell-IBRS.xml b/src/cpu_map/x86_Broadwell-IBRS.xml
index 9033d5fcd5..66ff838233 100644
--- a/src/cpu_map/x86_Broadwell-IBRS.xml
+++ b/src/cpu_map/x86_Broadwell-IBRS.xml
@@ -1,65 +1,65 @@
 <cpus>
-  <model name='Broadwell-IBRS'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='61'/> <!-- 0306d0 -->
-    <signature family='6' model='71'/> <!-- 040670 -->
-    <signature family='6' model='79'/> <!-- 0406f0 -->
-    <signature family='6' model='86'/> <!-- 050660 -->
-    <vendor name='Intel'/>
-    <feature name='3dnowprefetch'/>
-    <feature name='adx'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <feature name='bmi1'/>
-    <feature name='bmi2'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='erms'/>
-    <feature name='fma'/>
-    <feature name='fpu'/>
-    <feature name='fsgsbase'/>
-    <feature name='fxsr'/>
-    <feature name='hle'/>
-    <feature name='invpcid'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <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='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdseed'/>
-    <feature name='rdtscp'/>
-    <feature name='rtm'/>
-    <feature name='sep'/>
-    <feature name='smap'/>
-    <feature name='smep'/>
-    <feature name='spec-ctrl'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
-    <feature name='tsc-deadline'/>
-    <feature name='x2apic'/>
-    <feature name='xsave'/>
+  <model name="Broadwell-IBRS">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="61"/> <!-- 0306d0 -->
+    <signature family="6" model="71"/> <!-- 040670 -->
+    <signature family="6" model="79"/> <!-- 0406f0 -->
+    <signature family="6" model="86"/> <!-- 050660 -->
+    <vendor name="Intel"/>
+    <feature name="3dnowprefetch"/>
+    <feature name="adx"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <feature name="bmi1"/>
+    <feature name="bmi2"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="erms"/>
+    <feature name="fma"/>
+    <feature name="fpu"/>
+    <feature name="fsgsbase"/>
+    <feature name="fxsr"/>
+    <feature name="hle"/>
+    <feature name="invpcid"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <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="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdseed"/>
+    <feature name="rdtscp"/>
+    <feature name="rtm"/>
+    <feature name="sep"/>
+    <feature name="smap"/>
+    <feature name="smep"/>
+    <feature name="spec-ctrl"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
+    <feature name="tsc-deadline"/>
+    <feature name="x2apic"/>
+    <feature name="xsave"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml b/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
index c044b60e36..2c8f5a9f1b 100644
--- a/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
@@ -1,63 +1,63 @@
 <cpus>
-  <model name='Broadwell-noTSX-IBRS'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='61'/> <!-- 0306d0 -->
-    <signature family='6' model='71'/> <!-- 040670 -->
-    <signature family='6' model='79'/> <!-- 0406f0 -->
-    <signature family='6' model='86'/> <!-- 050660 -->
-    <vendor name='Intel'/>
-    <feature name='3dnowprefetch'/>
-    <feature name='adx'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <feature name='bmi1'/>
-    <feature name='bmi2'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='erms'/>
-    <feature name='fma'/>
-    <feature name='fpu'/>
-    <feature name='fsgsbase'/>
-    <feature name='fxsr'/>
-    <feature name='invpcid'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <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='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdseed'/>
-    <feature name='rdtscp'/>
-    <feature name='sep'/>
-    <feature name='smap'/>
-    <feature name='smep'/>
-    <feature name='spec-ctrl'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
-    <feature name='tsc-deadline'/>
-    <feature name='x2apic'/>
-    <feature name='xsave'/>
+  <model name="Broadwell-noTSX-IBRS">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="61"/> <!-- 0306d0 -->
+    <signature family="6" model="71"/> <!-- 040670 -->
+    <signature family="6" model="79"/> <!-- 0406f0 -->
+    <signature family="6" model="86"/> <!-- 050660 -->
+    <vendor name="Intel"/>
+    <feature name="3dnowprefetch"/>
+    <feature name="adx"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <feature name="bmi1"/>
+    <feature name="bmi2"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="erms"/>
+    <feature name="fma"/>
+    <feature name="fpu"/>
+    <feature name="fsgsbase"/>
+    <feature name="fxsr"/>
+    <feature name="invpcid"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <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="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdseed"/>
+    <feature name="rdtscp"/>
+    <feature name="sep"/>
+    <feature name="smap"/>
+    <feature name="smep"/>
+    <feature name="spec-ctrl"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
+    <feature name="tsc-deadline"/>
+    <feature name="x2apic"/>
+    <feature name="xsave"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Broadwell-noTSX.xml b/src/cpu_map/x86_Broadwell-noTSX.xml
index 637f29ba1c..4039f2b8d5 100644
--- a/src/cpu_map/x86_Broadwell-noTSX.xml
+++ b/src/cpu_map/x86_Broadwell-noTSX.xml
@@ -1,62 +1,62 @@
 <cpus>
-  <model name='Broadwell-noTSX'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='61'/> <!-- 0306d0 -->
-    <signature family='6' model='71'/> <!-- 040670 -->
-    <signature family='6' model='79'/> <!-- 0406f0 -->
-    <signature family='6' model='86'/> <!-- 050660 -->
-    <vendor name='Intel'/>
-    <feature name='3dnowprefetch'/>
-    <feature name='adx'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <feature name='bmi1'/>
-    <feature name='bmi2'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='erms'/>
-    <feature name='fma'/>
-    <feature name='fpu'/>
-    <feature name='fsgsbase'/>
-    <feature name='fxsr'/>
-    <feature name='invpcid'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <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='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdseed'/>
-    <feature name='rdtscp'/>
-    <feature name='sep'/>
-    <feature name='smap'/>
-    <feature name='smep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
-    <feature name='tsc-deadline'/>
-    <feature name='x2apic'/>
-    <feature name='xsave'/>
+  <model name="Broadwell-noTSX">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="61"/> <!-- 0306d0 -->
+    <signature family="6" model="71"/> <!-- 040670 -->
+    <signature family="6" model="79"/> <!-- 0406f0 -->
+    <signature family="6" model="86"/> <!-- 050660 -->
+    <vendor name="Intel"/>
+    <feature name="3dnowprefetch"/>
+    <feature name="adx"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <feature name="bmi1"/>
+    <feature name="bmi2"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="erms"/>
+    <feature name="fma"/>
+    <feature name="fpu"/>
+    <feature name="fsgsbase"/>
+    <feature name="fxsr"/>
+    <feature name="invpcid"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <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="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdseed"/>
+    <feature name="rdtscp"/>
+    <feature name="sep"/>
+    <feature name="smap"/>
+    <feature name="smep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
+    <feature name="tsc-deadline"/>
+    <feature name="x2apic"/>
+    <feature name="xsave"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Broadwell.xml b/src/cpu_map/x86_Broadwell.xml
index 82939a4509..cc5cbc5183 100644
--- a/src/cpu_map/x86_Broadwell.xml
+++ b/src/cpu_map/x86_Broadwell.xml
@@ -1,64 +1,64 @@
 <cpus>
-  <model name='Broadwell'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='61'/> <!-- 0306d0 -->
-    <signature family='6' model='71'/> <!-- 040670 -->
-    <signature family='6' model='79'/> <!-- 0406f0 -->
-    <signature family='6' model='86'/> <!-- 050660 -->
-    <vendor name='Intel'/>
-    <feature name='3dnowprefetch'/>
-    <feature name='adx'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <feature name='bmi1'/>
-    <feature name='bmi2'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='erms'/>
-    <feature name='fma'/>
-    <feature name='fpu'/>
-    <feature name='fsgsbase'/>
-    <feature name='fxsr'/>
-    <feature name='hle'/>
-    <feature name='invpcid'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <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='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdseed'/>
-    <feature name='rdtscp'/>
-    <feature name='rtm'/>
-    <feature name='sep'/>
-    <feature name='smap'/>
-    <feature name='smep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
-    <feature name='tsc-deadline'/>
-    <feature name='x2apic'/>
-    <feature name='xsave'/>
+  <model name="Broadwell">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="61"/> <!-- 0306d0 -->
+    <signature family="6" model="71"/> <!-- 040670 -->
+    <signature family="6" model="79"/> <!-- 0406f0 -->
+    <signature family="6" model="86"/> <!-- 050660 -->
+    <vendor name="Intel"/>
+    <feature name="3dnowprefetch"/>
+    <feature name="adx"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <feature name="bmi1"/>
+    <feature name="bmi2"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="erms"/>
+    <feature name="fma"/>
+    <feature name="fpu"/>
+    <feature name="fsgsbase"/>
+    <feature name="fxsr"/>
+    <feature name="hle"/>
+    <feature name="invpcid"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <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="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdseed"/>
+    <feature name="rdtscp"/>
+    <feature name="rtm"/>
+    <feature name="sep"/>
+    <feature name="smap"/>
+    <feature name="smep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
+    <feature name="tsc-deadline"/>
+    <feature name="x2apic"/>
+    <feature name="xsave"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Cascadelake-Server-noTSX.xml b/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
index bfd4629836..f45a7720e9 100644
--- a/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
+++ b/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
@@ -1,79 +1,79 @@
 <cpus>
-  <model name='Cascadelake-Server-noTSX'>
-    <decode host='on' guest='off'/>
-    <signature family='6' model='85' stepping='5-7'/> <!-- 050654 -->
-    <vendor name='Intel'/>
-    <feature name='3dnowprefetch'/>
-    <feature name='abm'/>
-    <feature name='adx'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='arat'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <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='invpcid'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='movbe'/>
-    <feature name='mpx'/>
-    <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='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdrand'/>
-    <feature name='rdseed'/>
-    <feature name='rdtscp'/>
-    <feature name='sep'/>
-    <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='syscall'/>
-    <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 name="Cascadelake-Server-noTSX">
+    <decode host="on" guest="off"/>
+    <signature family="6" model="85" stepping="5-7"/> <!-- 050654 -->
+    <vendor name="Intel"/>
+    <feature name="3dnowprefetch"/>
+    <feature name="abm"/>
+    <feature name="adx"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="arat"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <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="invpcid"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="movbe"/>
+    <feature name="mpx"/>
+    <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="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdrand"/>
+    <feature name="rdseed"/>
+    <feature name="rdtscp"/>
+    <feature name="sep"/>
+    <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="syscall"/>
+    <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>
diff --git a/src/cpu_map/x86_Cascadelake-Server.xml b/src/cpu_map/x86_Cascadelake-Server.xml
index 335e9cb584..b6c39153a5 100644
--- a/src/cpu_map/x86_Cascadelake-Server.xml
+++ b/src/cpu_map/x86_Cascadelake-Server.xml
@@ -1,81 +1,81 @@
 <cpus>
-  <model name='Cascadelake-Server'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='85' stepping='5-7'/> <!-- 050654 -->
-    <vendor name='Intel'/>
-    <feature name='3dnowprefetch'/>
-    <feature name='abm'/>
-    <feature name='adx'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='arat'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <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='invpcid'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='movbe'/>
-    <feature name='mpx'/>
-    <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='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdrand'/>
-    <feature name='rdseed'/>
-    <feature name='rdtscp'/>
-    <feature name='rtm'/>
-    <feature name='sep'/>
-    <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='syscall'/>
-    <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 name="Cascadelake-Server">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="85" stepping="5-7"/> <!-- 050654 -->
+    <vendor name="Intel"/>
+    <feature name="3dnowprefetch"/>
+    <feature name="abm"/>
+    <feature name="adx"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="arat"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <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="invpcid"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="movbe"/>
+    <feature name="mpx"/>
+    <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="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdrand"/>
+    <feature name="rdseed"/>
+    <feature name="rdtscp"/>
+    <feature name="rtm"/>
+    <feature name="sep"/>
+    <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="syscall"/>
+    <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>
diff --git a/src/cpu_map/x86_Conroe.xml b/src/cpu_map/x86_Conroe.xml
index 4cacee6142..6ab92274dd 100644
--- a/src/cpu_map/x86_Conroe.xml
+++ b/src/cpu_map/x86_Conroe.xml
@@ -1,35 +1,35 @@
 <cpus>
-  <model name='Conroe'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='15'/> <!-- 0006f0 -->
-    <signature family='6' model='22'/> <!-- 010660 -->
-    <vendor name='Intel'/>
-    <feature name='apic'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='sep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
+  <model name="Conroe">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="15"/> <!-- 0006f0 -->
+    <signature family="6" model="22"/> <!-- 010660 -->
+    <vendor name="Intel"/>
+    <feature name="apic"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="sep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Cooperlake.xml b/src/cpu_map/x86_Cooperlake.xml
index 41bd210638..a2bac92526 100644
--- a/src/cpu_map/x86_Cooperlake.xml
+++ b/src/cpu_map/x86_Cooperlake.xml
@@ -1,8 +1,8 @@
 <cpus>
-  <model name='Cooperlake'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='85' stepping='10-11'/> <!-- 05065b -->
-    <vendor name='Intel'/>
+  <model name="Cooperlake">
+    <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"/>
diff --git a/src/cpu_map/x86_Dhyana.xml b/src/cpu_map/x86_Dhyana.xml
index 689daf8649..1a00833d02 100644
--- a/src/cpu_map/x86_Dhyana.xml
+++ b/src/cpu_map/x86_Dhyana.xml
@@ -1,71 +1,71 @@
 <cpus>
-  <model name='Dhyana'>
-    <decode host='on' guest='on'/>
-    <signature family='24' model='0'/> <!-- 900f00 -->
-    <vendor name='Hygon'/>
-    <feature name='3dnowprefetch'/>
-    <feature name='abm'/>
-    <feature name='adx'/>
-    <feature name='apic'/>
-    <feature name='arat'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <feature name='bmi1'/>
-    <feature name='bmi2'/>
-    <feature name='clflush'/>
-    <feature name='clflushopt'/>
-    <feature name='cmov'/>
-    <feature name='cr8legacy'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='f16c'/>
-    <feature name='fma'/>
-    <feature name='fpu'/>
-    <feature name='fsgsbase'/>
-    <feature name='fxsr'/>
-    <feature name='fxsr_opt'/>
-    <feature name='ibpb'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='misalignsse'/>
-    <feature name='mmx'/>
-    <feature name='mmxext'/>
-    <feature name='monitor'/>
-    <feature name='movbe'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='osvw'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pdpe1gb'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdrand'/>
-    <feature name='rdseed'/>
-    <feature name='rdtscp'/>
-    <feature name='sep'/>
-    <feature name='smap'/>
-    <feature name='smep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='sse4a'/>
-    <feature name='ssse3'/>
-    <feature name='svm'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
-    <feature name='vme'/>
-    <feature name='xgetbv1'/>
-    <feature name='xsave'/>
-    <feature name='xsavec'/>
-    <feature name='xsaveopt'/>
+  <model name="Dhyana">
+    <decode host="on" guest="on"/>
+    <signature family="24" model="0"/> <!-- 900f00 -->
+    <vendor name="Hygon"/>
+    <feature name="3dnowprefetch"/>
+    <feature name="abm"/>
+    <feature name="adx"/>
+    <feature name="apic"/>
+    <feature name="arat"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <feature name="bmi1"/>
+    <feature name="bmi2"/>
+    <feature name="clflush"/>
+    <feature name="clflushopt"/>
+    <feature name="cmov"/>
+    <feature name="cr8legacy"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="f16c"/>
+    <feature name="fma"/>
+    <feature name="fpu"/>
+    <feature name="fsgsbase"/>
+    <feature name="fxsr"/>
+    <feature name="fxsr_opt"/>
+    <feature name="ibpb"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="misalignsse"/>
+    <feature name="mmx"/>
+    <feature name="mmxext"/>
+    <feature name="monitor"/>
+    <feature name="movbe"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="osvw"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pdpe1gb"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdrand"/>
+    <feature name="rdseed"/>
+    <feature name="rdtscp"/>
+    <feature name="sep"/>
+    <feature name="smap"/>
+    <feature name="smep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="sse4a"/>
+    <feature name="ssse3"/>
+    <feature name="svm"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
+    <feature name="vme"/>
+    <feature name="xgetbv1"/>
+    <feature name="xsave"/>
+    <feature name="xsavec"/>
+    <feature name="xsaveopt"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_EPYC-IBPB.xml b/src/cpu_map/x86_EPYC-IBPB.xml
index 983c5f4445..0ea2a2edfb 100644
--- a/src/cpu_map/x86_EPYC-IBPB.xml
+++ b/src/cpu_map/x86_EPYC-IBPB.xml
@@ -1,74 +1,74 @@
 <cpus>
-  <model name='EPYC-IBPB'>
-    <decode host='on' guest='on'/>
-    <signature family='23' model='1'/> <!-- 800f10 -->
-    <vendor name='AMD'/>
-    <feature name='3dnowprefetch'/>
-    <feature name='abm'/>
-    <feature name='adx'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='arat'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <feature name='bmi1'/>
-    <feature name='bmi2'/>
-    <feature name='clflush'/>
-    <feature name='clflushopt'/>
-    <feature name='cmov'/>
-    <feature name='cr8legacy'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='f16c'/>
-    <feature name='fma'/>
-    <feature name='fpu'/>
-    <feature name='fsgsbase'/>
-    <feature name='fxsr'/>
-    <feature name='fxsr_opt'/>
-    <feature name='ibpb'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='misalignsse'/>
-    <feature name='mmx'/>
-    <feature name='mmxext'/>
-    <feature name='monitor'/>
-    <feature name='movbe'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='osvw'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pclmuldq'/>
-    <feature name='pdpe1gb'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdrand'/>
-    <feature name='rdseed'/>
-    <feature name='rdtscp'/>
-    <feature name='sep'/>
-    <feature name='sha-ni'/>
-    <feature name='smap'/>
-    <feature name='smep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='sse4a'/>
-    <feature name='ssse3'/>
-    <feature name='svm'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
-    <feature name='vme'/>
-    <feature name='xgetbv1'/>
-    <feature name='xsave'/>
-    <feature name='xsavec'/>
-    <feature name='xsaveopt'/>
+  <model name="EPYC-IBPB">
+    <decode host="on" guest="on"/>
+    <signature family="23" model="1"/> <!-- 800f10 -->
+    <vendor name="AMD"/>
+    <feature name="3dnowprefetch"/>
+    <feature name="abm"/>
+    <feature name="adx"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="arat"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <feature name="bmi1"/>
+    <feature name="bmi2"/>
+    <feature name="clflush"/>
+    <feature name="clflushopt"/>
+    <feature name="cmov"/>
+    <feature name="cr8legacy"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="f16c"/>
+    <feature name="fma"/>
+    <feature name="fpu"/>
+    <feature name="fsgsbase"/>
+    <feature name="fxsr"/>
+    <feature name="fxsr_opt"/>
+    <feature name="ibpb"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="misalignsse"/>
+    <feature name="mmx"/>
+    <feature name="mmxext"/>
+    <feature name="monitor"/>
+    <feature name="movbe"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="osvw"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pclmuldq"/>
+    <feature name="pdpe1gb"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdrand"/>
+    <feature name="rdseed"/>
+    <feature name="rdtscp"/>
+    <feature name="sep"/>
+    <feature name="sha-ni"/>
+    <feature name="smap"/>
+    <feature name="smep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="sse4a"/>
+    <feature name="ssse3"/>
+    <feature name="svm"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
+    <feature name="vme"/>
+    <feature name="xgetbv1"/>
+    <feature name="xsave"/>
+    <feature name="xsavec"/>
+    <feature name="xsaveopt"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_EPYC-Rome.xml b/src/cpu_map/x86_EPYC-Rome.xml
index e54d0a48d8..c38fb760a8 100644
--- a/src/cpu_map/x86_EPYC-Rome.xml
+++ b/src/cpu_map/x86_EPYC-Rome.xml
@@ -1,83 +1,83 @@
 <cpus>
-  <model name='EPYC-Rome'>
-    <decode host='on' guest='on'/>
-    <signature family='23' model='49'/>
-    <vendor name='AMD'/>
-    <feature name='3dnowprefetch'/>
-    <feature name='abm'/>
-    <feature name='adx'/>
-    <feature name='aes'/>
-    <feature name='amd-stibp'/>
-    <feature name='apic'/>
-    <feature name='arat'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <feature name='bmi1'/>
-    <feature name='bmi2'/>
-    <feature name='clflush'/>
-    <feature name='clflushopt'/>
-    <feature name='clwb'/>
-    <feature name='clzero'/>
-    <feature name='cmov'/>
-    <feature name='cr8legacy'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='f16c'/>
-    <feature name='fma'/>
-    <feature name='fpu'/>
-    <feature name='fsgsbase'/>
-    <feature name='fxsr'/>
-    <feature name='fxsr_opt'/>
-    <feature name='ibpb'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='misalignsse'/>
-    <feature name='mmx'/>
-    <feature name='mmxext'/>
-    <feature name='movbe'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='npt'/>
-    <feature name='nrip-save'/>
-    <feature name='nx'/>
-    <feature name='osvw'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pclmuldq'/>
-    <feature name='pdpe1gb'/>
-    <feature name='perfctr_core'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdpid'/>
-    <feature name='rdrand'/>
-    <feature name='rdseed'/>
-    <feature name='rdtscp'/>
-    <feature name='sep'/>
-    <feature name='sha-ni'/>
-    <feature name='smap'/>
-    <feature name='smep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='sse4a'/>
-    <feature name='ssse3'/>
-    <feature name='svm'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
-    <feature name='umip'/>
-    <feature name='vme'/>
-    <feature name='wbnoinvd'/>
-    <feature name='xgetbv1'/>
-    <feature name='xsave'/>
-    <feature name='xsavec'/>
-    <feature name='xsaveerptr'/>
-    <feature name='xsaveopt'/>
+  <model name="EPYC-Rome">
+    <decode host="on" guest="on"/>
+    <signature family="23" model="49"/>
+    <vendor name="AMD"/>
+    <feature name="3dnowprefetch"/>
+    <feature name="abm"/>
+    <feature name="adx"/>
+    <feature name="aes"/>
+    <feature name="amd-stibp"/>
+    <feature name="apic"/>
+    <feature name="arat"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <feature name="bmi1"/>
+    <feature name="bmi2"/>
+    <feature name="clflush"/>
+    <feature name="clflushopt"/>
+    <feature name="clwb"/>
+    <feature name="clzero"/>
+    <feature name="cmov"/>
+    <feature name="cr8legacy"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="f16c"/>
+    <feature name="fma"/>
+    <feature name="fpu"/>
+    <feature name="fsgsbase"/>
+    <feature name="fxsr"/>
+    <feature name="fxsr_opt"/>
+    <feature name="ibpb"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="misalignsse"/>
+    <feature name="mmx"/>
+    <feature name="mmxext"/>
+    <feature name="movbe"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="npt"/>
+    <feature name="nrip-save"/>
+    <feature name="nx"/>
+    <feature name="osvw"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pclmuldq"/>
+    <feature name="pdpe1gb"/>
+    <feature name="perfctr_core"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdpid"/>
+    <feature name="rdrand"/>
+    <feature name="rdseed"/>
+    <feature name="rdtscp"/>
+    <feature name="sep"/>
+    <feature name="sha-ni"/>
+    <feature name="smap"/>
+    <feature name="smep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="sse4a"/>
+    <feature name="ssse3"/>
+    <feature name="svm"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
+    <feature name="umip"/>
+    <feature name="vme"/>
+    <feature name="wbnoinvd"/>
+    <feature name="xgetbv1"/>
+    <feature name="xsave"/>
+    <feature name="xsavec"/>
+    <feature name="xsaveerptr"/>
+    <feature name="xsaveopt"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_EPYC.xml b/src/cpu_map/x86_EPYC.xml
index 3ebba9f4ed..36462a0dda 100644
--- a/src/cpu_map/x86_EPYC.xml
+++ b/src/cpu_map/x86_EPYC.xml
@@ -1,73 +1,73 @@
 <cpus>
-  <model name='EPYC'>
-    <decode host='on' guest='on'/>
-    <signature family='23' model='1'/> <!-- 800f10 -->
-    <vendor name='AMD'/>
-    <feature name='3dnowprefetch'/>
-    <feature name='abm'/>
-    <feature name='adx'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='arat'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <feature name='bmi1'/>
-    <feature name='bmi2'/>
-    <feature name='clflush'/>
-    <feature name='clflushopt'/>
-    <feature name='cmov'/>
-    <feature name='cr8legacy'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='f16c'/>
-    <feature name='fma'/>
-    <feature name='fpu'/>
-    <feature name='fsgsbase'/>
-    <feature name='fxsr'/>
-    <feature name='fxsr_opt'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='misalignsse'/>
-    <feature name='mmx'/>
-    <feature name='mmxext'/>
-    <feature name='monitor'/>
-    <feature name='movbe'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='osvw'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pclmuldq'/>
-    <feature name='pdpe1gb'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdrand'/>
-    <feature name='rdseed'/>
-    <feature name='rdtscp'/>
-    <feature name='sep'/>
-    <feature name='sha-ni'/>
-    <feature name='smap'/>
-    <feature name='smep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='sse4a'/>
-    <feature name='ssse3'/>
-    <feature name='svm'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
-    <feature name='vme'/>
-    <feature name='xgetbv1'/>
-    <feature name='xsave'/>
-    <feature name='xsavec'/>
-    <feature name='xsaveopt'/>
+  <model name="EPYC">
+    <decode host="on" guest="on"/>
+    <signature family="23" model="1"/> <!-- 800f10 -->
+    <vendor name="AMD"/>
+    <feature name="3dnowprefetch"/>
+    <feature name="abm"/>
+    <feature name="adx"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="arat"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <feature name="bmi1"/>
+    <feature name="bmi2"/>
+    <feature name="clflush"/>
+    <feature name="clflushopt"/>
+    <feature name="cmov"/>
+    <feature name="cr8legacy"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="f16c"/>
+    <feature name="fma"/>
+    <feature name="fpu"/>
+    <feature name="fsgsbase"/>
+    <feature name="fxsr"/>
+    <feature name="fxsr_opt"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="misalignsse"/>
+    <feature name="mmx"/>
+    <feature name="mmxext"/>
+    <feature name="monitor"/>
+    <feature name="movbe"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="osvw"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pclmuldq"/>
+    <feature name="pdpe1gb"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdrand"/>
+    <feature name="rdseed"/>
+    <feature name="rdtscp"/>
+    <feature name="sep"/>
+    <feature name="sha-ni"/>
+    <feature name="smap"/>
+    <feature name="smep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="sse4a"/>
+    <feature name="ssse3"/>
+    <feature name="svm"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
+    <feature name="vme"/>
+    <feature name="xgetbv1"/>
+    <feature name="xsave"/>
+    <feature name="xsavec"/>
+    <feature name="xsaveopt"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Haswell-IBRS.xml b/src/cpu_map/x86_Haswell-IBRS.xml
index 0ffe2bae0d..51052a16de 100644
--- a/src/cpu_map/x86_Haswell-IBRS.xml
+++ b/src/cpu_map/x86_Haswell-IBRS.xml
@@ -1,61 +1,61 @@
 <cpus>
-  <model name='Haswell-IBRS'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='60'/> <!-- 0306c0 -->
-    <signature family='6' model='63'/> <!-- 0306f0 -->
-    <signature family='6' model='69'/> <!-- 040650 -->
-    <signature family='6' model='70'/> <!-- 040660 -->
-    <vendor name='Intel'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <feature name='bmi1'/>
-    <feature name='bmi2'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='erms'/>
-    <feature name='fma'/>
-    <feature name='fpu'/>
-    <feature name='fsgsbase'/>
-    <feature name='fxsr'/>
-    <feature name='hle'/>
-    <feature name='invpcid'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <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='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdtscp'/>
-    <feature name='rtm'/>
-    <feature name='sep'/>
-    <feature name='smep'/>
-    <feature name='spec-ctrl'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
-    <feature name='tsc-deadline'/>
-    <feature name='x2apic'/>
-    <feature name='xsave'/>
+  <model name="Haswell-IBRS">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="60"/> <!-- 0306c0 -->
+    <signature family="6" model="63"/> <!-- 0306f0 -->
+    <signature family="6" model="69"/> <!-- 040650 -->
+    <signature family="6" model="70"/> <!-- 040660 -->
+    <vendor name="Intel"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <feature name="bmi1"/>
+    <feature name="bmi2"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="erms"/>
+    <feature name="fma"/>
+    <feature name="fpu"/>
+    <feature name="fsgsbase"/>
+    <feature name="fxsr"/>
+    <feature name="hle"/>
+    <feature name="invpcid"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <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="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdtscp"/>
+    <feature name="rtm"/>
+    <feature name="sep"/>
+    <feature name="smep"/>
+    <feature name="spec-ctrl"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
+    <feature name="tsc-deadline"/>
+    <feature name="x2apic"/>
+    <feature name="xsave"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Haswell-noTSX-IBRS.xml b/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
index 75d709c009..8db662a267 100644
--- a/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
@@ -1,59 +1,59 @@
 <cpus>
-  <model name='Haswell-noTSX-IBRS'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='60'/> <!-- 0306c0 -->
-    <signature family='6' model='63'/> <!-- 0306f0 -->
-    <signature family='6' model='69'/> <!-- 040650 -->
-    <signature family='6' model='70'/> <!-- 040660 -->
-    <vendor name='Intel'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <feature name='bmi1'/>
-    <feature name='bmi2'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='erms'/>
-    <feature name='fma'/>
-    <feature name='fpu'/>
-    <feature name='fsgsbase'/>
-    <feature name='fxsr'/>
-    <feature name='invpcid'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <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='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdtscp'/>
-    <feature name='sep'/>
-    <feature name='smep'/>
-    <feature name='spec-ctrl'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
-    <feature name='tsc-deadline'/>
-    <feature name='x2apic'/>
-    <feature name='xsave'/>
+  <model name="Haswell-noTSX-IBRS">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="60"/> <!-- 0306c0 -->
+    <signature family="6" model="63"/> <!-- 0306f0 -->
+    <signature family="6" model="69"/> <!-- 040650 -->
+    <signature family="6" model="70"/> <!-- 040660 -->
+    <vendor name="Intel"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <feature name="bmi1"/>
+    <feature name="bmi2"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="erms"/>
+    <feature name="fma"/>
+    <feature name="fpu"/>
+    <feature name="fsgsbase"/>
+    <feature name="fxsr"/>
+    <feature name="invpcid"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <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="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdtscp"/>
+    <feature name="sep"/>
+    <feature name="smep"/>
+    <feature name="spec-ctrl"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
+    <feature name="tsc-deadline"/>
+    <feature name="x2apic"/>
+    <feature name="xsave"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Haswell-noTSX.xml b/src/cpu_map/x86_Haswell-noTSX.xml
index b0a0faa856..2379564011 100644
--- a/src/cpu_map/x86_Haswell-noTSX.xml
+++ b/src/cpu_map/x86_Haswell-noTSX.xml
@@ -1,58 +1,58 @@
 <cpus>
-  <model name='Haswell-noTSX'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='60'/> <!-- 0306c0 -->
-    <signature family='6' model='63'/> <!-- 0306f0 -->
-    <signature family='6' model='69'/> <!-- 040650 -->
-    <signature family='6' model='70'/> <!-- 040660 -->
-    <vendor name='Intel'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <feature name='bmi1'/>
-    <feature name='bmi2'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='erms'/>
-    <feature name='fma'/>
-    <feature name='fpu'/>
-    <feature name='fsgsbase'/>
-    <feature name='fxsr'/>
-    <feature name='invpcid'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <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='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdtscp'/>
-    <feature name='sep'/>
-    <feature name='smep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
-    <feature name='tsc-deadline'/>
-    <feature name='x2apic'/>
-    <feature name='xsave'/>
+  <model name="Haswell-noTSX">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="60"/> <!-- 0306c0 -->
+    <signature family="6" model="63"/> <!-- 0306f0 -->
+    <signature family="6" model="69"/> <!-- 040650 -->
+    <signature family="6" model="70"/> <!-- 040660 -->
+    <vendor name="Intel"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <feature name="bmi1"/>
+    <feature name="bmi2"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="erms"/>
+    <feature name="fma"/>
+    <feature name="fpu"/>
+    <feature name="fsgsbase"/>
+    <feature name="fxsr"/>
+    <feature name="invpcid"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <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="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdtscp"/>
+    <feature name="sep"/>
+    <feature name="smep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
+    <feature name="tsc-deadline"/>
+    <feature name="x2apic"/>
+    <feature name="xsave"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Haswell.xml b/src/cpu_map/x86_Haswell.xml
index ee16b30f19..6670303b8b 100644
--- a/src/cpu_map/x86_Haswell.xml
+++ b/src/cpu_map/x86_Haswell.xml
@@ -1,60 +1,60 @@
 <cpus>
-  <model name='Haswell'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='60'/> <!-- 0306c0 -->
-    <signature family='6' model='63'/> <!-- 0306f0 -->
-    <signature family='6' model='69'/> <!-- 040650 -->
-    <signature family='6' model='70'/> <!-- 040660 -->
-    <vendor name='Intel'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <feature name='bmi1'/>
-    <feature name='bmi2'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='erms'/>
-    <feature name='fma'/>
-    <feature name='fpu'/>
-    <feature name='fsgsbase'/>
-    <feature name='fxsr'/>
-    <feature name='hle'/>
-    <feature name='invpcid'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <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='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdtscp'/>
-    <feature name='rtm'/>
-    <feature name='sep'/>
-    <feature name='smep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
-    <feature name='tsc-deadline'/>
-    <feature name='x2apic'/>
-    <feature name='xsave'/>
+  <model name="Haswell">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="60"/> <!-- 0306c0 -->
+    <signature family="6" model="63"/> <!-- 0306f0 -->
+    <signature family="6" model="69"/> <!-- 040650 -->
+    <signature family="6" model="70"/> <!-- 040660 -->
+    <vendor name="Intel"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <feature name="bmi1"/>
+    <feature name="bmi2"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="erms"/>
+    <feature name="fma"/>
+    <feature name="fpu"/>
+    <feature name="fsgsbase"/>
+    <feature name="fxsr"/>
+    <feature name="hle"/>
+    <feature name="invpcid"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <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="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdtscp"/>
+    <feature name="rtm"/>
+    <feature name="sep"/>
+    <feature name="smep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
+    <feature name="tsc-deadline"/>
+    <feature name="x2apic"/>
+    <feature name="xsave"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Icelake-Client-noTSX.xml b/src/cpu_map/x86_Icelake-Client-noTSX.xml
index 65e648ae21..57bd2c2587 100644
--- a/src/cpu_map/x86_Icelake-Client-noTSX.xml
+++ b/src/cpu_map/x86_Icelake-Client-noTSX.xml
@@ -1,82 +1,82 @@
 <cpus>
-  <model name='Icelake-Client-noTSX'>
-    <decode host='on' guest='off'/>
-    <signature family='6' model='126'/> <!-- 0706e0 -->
-    <vendor name='Intel'/>
-    <feature name='3dnowprefetch'/>
-    <feature name='abm'/>
-    <feature name='adx'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='arat'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <feature name='avx512-vpopcntdq'/>
-    <feature name='avx512bitalg'/>
-    <feature name='avx512vbmi'/>
-    <feature name='avx512vbmi2'/>
-    <feature name='avx512vnni'/>
-    <feature name='bmi1'/>
-    <feature name='bmi2'/>
-    <feature name='clflush'/>
-    <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='gfni'/>
-    <feature name='intel-pt'/>
-    <feature name='invpcid'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='movbe'/>
-    <feature name='mpx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pcid'/>
-    <feature name='pclmuldq'/>
-    <feature name='pge'/>
-    <feature name='pku'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdrand'/>
-    <feature name='rdseed'/>
-    <feature name='rdtscp'/>
-    <feature name='sep'/>
-    <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='syscall'/>
-    <feature name='tsc'/>
-    <feature name='tsc-deadline'/>
-    <feature name='umip'/>
-    <feature name='vaes'/>
-    <feature name='vme'/>
-    <feature name='vpclmulqdq'/>
-    <feature name='wbnoinvd'/>
-    <feature name='x2apic'/>
-    <feature name='xgetbv1'/>
-    <feature name='xsave'/>
-    <feature name='xsavec'/>
-    <feature name='xsaveopt'/>
+  <model name="Icelake-Client-noTSX">
+    <decode host="on" guest="off"/>
+    <signature family="6" model="126"/> <!-- 0706e0 -->
+    <vendor name="Intel"/>
+    <feature name="3dnowprefetch"/>
+    <feature name="abm"/>
+    <feature name="adx"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="arat"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <feature name="avx512-vpopcntdq"/>
+    <feature name="avx512bitalg"/>
+    <feature name="avx512vbmi"/>
+    <feature name="avx512vbmi2"/>
+    <feature name="avx512vnni"/>
+    <feature name="bmi1"/>
+    <feature name="bmi2"/>
+    <feature name="clflush"/>
+    <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="gfni"/>
+    <feature name="intel-pt"/>
+    <feature name="invpcid"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="movbe"/>
+    <feature name="mpx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pcid"/>
+    <feature name="pclmuldq"/>
+    <feature name="pge"/>
+    <feature name="pku"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdrand"/>
+    <feature name="rdseed"/>
+    <feature name="rdtscp"/>
+    <feature name="sep"/>
+    <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="syscall"/>
+    <feature name="tsc"/>
+    <feature name="tsc-deadline"/>
+    <feature name="umip"/>
+    <feature name="vaes"/>
+    <feature name="vme"/>
+    <feature name="vpclmulqdq"/>
+    <feature name="wbnoinvd"/>
+    <feature name="x2apic"/>
+    <feature name="xgetbv1"/>
+    <feature name="xsave"/>
+    <feature name="xsavec"/>
+    <feature name="xsaveopt"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Icelake-Client.xml b/src/cpu_map/x86_Icelake-Client.xml
index 5cf32e91fa..c927ac1993 100644
--- a/src/cpu_map/x86_Icelake-Client.xml
+++ b/src/cpu_map/x86_Icelake-Client.xml
@@ -1,84 +1,84 @@
 <cpus>
-  <model name='Icelake-Client'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='126'/> <!-- 0706e0 -->
-    <vendor name='Intel'/>
-    <feature name='3dnowprefetch'/>
-    <feature name='abm'/>
-    <feature name='adx'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='arat'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <feature name='avx512-vpopcntdq'/>
-    <feature name='avx512bitalg'/>
-    <feature name='avx512vbmi'/>
-    <feature name='avx512vbmi2'/>
-    <feature name='avx512vnni'/>
-    <feature name='bmi1'/>
-    <feature name='bmi2'/>
-    <feature name='clflush'/>
-    <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='gfni'/>
-    <feature name='hle'/>
-    <feature name='intel-pt'/>
-    <feature name='invpcid'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='movbe'/>
-    <feature name='mpx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pcid'/>
-    <feature name='pclmuldq'/>
-    <feature name='pge'/>
-    <feature name='pku'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdrand'/>
-    <feature name='rdseed'/>
-    <feature name='rdtscp'/>
-    <feature name='rtm'/>
-    <feature name='sep'/>
-    <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='syscall'/>
-    <feature name='tsc'/>
-    <feature name='tsc-deadline'/>
-    <feature name='umip'/>
-    <feature name='vaes'/>
-    <feature name='vme'/>
-    <feature name='vpclmulqdq'/>
-    <feature name='wbnoinvd'/>
-    <feature name='x2apic'/>
-    <feature name='xgetbv1'/>
-    <feature name='xsave'/>
-    <feature name='xsavec'/>
-    <feature name='xsaveopt'/>
+  <model name="Icelake-Client">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="126"/> <!-- 0706e0 -->
+    <vendor name="Intel"/>
+    <feature name="3dnowprefetch"/>
+    <feature name="abm"/>
+    <feature name="adx"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="arat"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <feature name="avx512-vpopcntdq"/>
+    <feature name="avx512bitalg"/>
+    <feature name="avx512vbmi"/>
+    <feature name="avx512vbmi2"/>
+    <feature name="avx512vnni"/>
+    <feature name="bmi1"/>
+    <feature name="bmi2"/>
+    <feature name="clflush"/>
+    <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="gfni"/>
+    <feature name="hle"/>
+    <feature name="intel-pt"/>
+    <feature name="invpcid"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="movbe"/>
+    <feature name="mpx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pcid"/>
+    <feature name="pclmuldq"/>
+    <feature name="pge"/>
+    <feature name="pku"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdrand"/>
+    <feature name="rdseed"/>
+    <feature name="rdtscp"/>
+    <feature name="rtm"/>
+    <feature name="sep"/>
+    <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="syscall"/>
+    <feature name="tsc"/>
+    <feature name="tsc-deadline"/>
+    <feature name="umip"/>
+    <feature name="vaes"/>
+    <feature name="vme"/>
+    <feature name="vpclmulqdq"/>
+    <feature name="wbnoinvd"/>
+    <feature name="x2apic"/>
+    <feature name="xgetbv1"/>
+    <feature name="xsave"/>
+    <feature name="xsavec"/>
+    <feature name="xsaveopt"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Icelake-Server-noTSX.xml b/src/cpu_map/x86_Icelake-Server-noTSX.xml
index 2fd6906406..3ed475bb32 100644
--- a/src/cpu_map/x86_Icelake-Server-noTSX.xml
+++ b/src/cpu_map/x86_Icelake-Server-noTSX.xml
@@ -1,91 +1,91 @@
 <cpus>
-  <model name='Icelake-Server-noTSX'>
-    <decode host='on' guest='off'/>
-    <signature family='6' model='134'/> <!-- 080660 -->
-    <vendor name='Intel'/>
-    <feature name='3dnowprefetch'/>
-    <feature name='abm'/>
-    <feature name='adx'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='arat'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <feature name='avx512-vpopcntdq'/>
-    <feature name='avx512bitalg'/>
-    <feature name='avx512bw'/>
-    <feature name='avx512cd'/>
-    <feature name='avx512dq'/>
-    <feature name='avx512f'/>
-    <feature name='avx512vbmi'/>
-    <feature name='avx512vbmi2'/>
-    <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='gfni'/>
-    <feature name='intel-pt'/>
-    <feature name='invpcid'/>
-    <feature name='la57'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='movbe'/>
-    <feature name='mpx'/>
-    <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='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdrand'/>
-    <feature name='rdseed'/>
-    <feature name='rdtscp'/>
-    <feature name='sep'/>
-    <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='syscall'/>
-    <feature name='tsc'/>
-    <feature name='tsc-deadline'/>
-    <feature name='umip'/>
-    <feature name='vaes'/>
-    <feature name='vme'/>
-    <feature name='vpclmulqdq'/>
-    <feature name='wbnoinvd'/>
-    <feature name='x2apic'/>
-    <feature name='xgetbv1'/>
-    <feature name='xsave'/>
-    <feature name='xsavec'/>
-    <feature name='xsaveopt'/>
+  <model name="Icelake-Server-noTSX">
+    <decode host="on" guest="off"/>
+    <signature family="6" model="134"/> <!-- 080660 -->
+    <vendor name="Intel"/>
+    <feature name="3dnowprefetch"/>
+    <feature name="abm"/>
+    <feature name="adx"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="arat"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <feature name="avx512-vpopcntdq"/>
+    <feature name="avx512bitalg"/>
+    <feature name="avx512bw"/>
+    <feature name="avx512cd"/>
+    <feature name="avx512dq"/>
+    <feature name="avx512f"/>
+    <feature name="avx512vbmi"/>
+    <feature name="avx512vbmi2"/>
+    <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="gfni"/>
+    <feature name="intel-pt"/>
+    <feature name="invpcid"/>
+    <feature name="la57"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="movbe"/>
+    <feature name="mpx"/>
+    <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="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdrand"/>
+    <feature name="rdseed"/>
+    <feature name="rdtscp"/>
+    <feature name="sep"/>
+    <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="syscall"/>
+    <feature name="tsc"/>
+    <feature name="tsc-deadline"/>
+    <feature name="umip"/>
+    <feature name="vaes"/>
+    <feature name="vme"/>
+    <feature name="vpclmulqdq"/>
+    <feature name="wbnoinvd"/>
+    <feature name="x2apic"/>
+    <feature name="xgetbv1"/>
+    <feature name="xsave"/>
+    <feature name="xsavec"/>
+    <feature name="xsaveopt"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Icelake-Server.xml b/src/cpu_map/x86_Icelake-Server.xml
index 367ade7240..19c7da10b0 100644
--- a/src/cpu_map/x86_Icelake-Server.xml
+++ b/src/cpu_map/x86_Icelake-Server.xml
@@ -1,93 +1,93 @@
 <cpus>
-  <model name='Icelake-Server'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='134'/> <!-- 080660 -->
-    <vendor name='Intel'/>
-    <feature name='3dnowprefetch'/>
-    <feature name='abm'/>
-    <feature name='adx'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='arat'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <feature name='avx512-vpopcntdq'/>
-    <feature name='avx512bitalg'/>
-    <feature name='avx512bw'/>
-    <feature name='avx512cd'/>
-    <feature name='avx512dq'/>
-    <feature name='avx512f'/>
-    <feature name='avx512vbmi'/>
-    <feature name='avx512vbmi2'/>
-    <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='gfni'/>
-    <feature name='hle'/>
-    <feature name='intel-pt'/>
-    <feature name='invpcid'/>
-    <feature name='la57'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='movbe'/>
-    <feature name='mpx'/>
-    <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='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdrand'/>
-    <feature name='rdseed'/>
-    <feature name='rdtscp'/>
-    <feature name='rtm'/>
-    <feature name='sep'/>
-    <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='syscall'/>
-    <feature name='tsc'/>
-    <feature name='tsc-deadline'/>
-    <feature name='umip'/>
-    <feature name='vaes'/>
-    <feature name='vme'/>
-    <feature name='vpclmulqdq'/>
-    <feature name='wbnoinvd'/>
-    <feature name='x2apic'/>
-    <feature name='xgetbv1'/>
-    <feature name='xsave'/>
-    <feature name='xsavec'/>
-    <feature name='xsaveopt'/>
+  <model name="Icelake-Server">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="134"/> <!-- 080660 -->
+    <vendor name="Intel"/>
+    <feature name="3dnowprefetch"/>
+    <feature name="abm"/>
+    <feature name="adx"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="arat"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <feature name="avx512-vpopcntdq"/>
+    <feature name="avx512bitalg"/>
+    <feature name="avx512bw"/>
+    <feature name="avx512cd"/>
+    <feature name="avx512dq"/>
+    <feature name="avx512f"/>
+    <feature name="avx512vbmi"/>
+    <feature name="avx512vbmi2"/>
+    <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="gfni"/>
+    <feature name="hle"/>
+    <feature name="intel-pt"/>
+    <feature name="invpcid"/>
+    <feature name="la57"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="movbe"/>
+    <feature name="mpx"/>
+    <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="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdrand"/>
+    <feature name="rdseed"/>
+    <feature name="rdtscp"/>
+    <feature name="rtm"/>
+    <feature name="sep"/>
+    <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="syscall"/>
+    <feature name="tsc"/>
+    <feature name="tsc-deadline"/>
+    <feature name="umip"/>
+    <feature name="vaes"/>
+    <feature name="vme"/>
+    <feature name="vpclmulqdq"/>
+    <feature name="wbnoinvd"/>
+    <feature name="x2apic"/>
+    <feature name="xgetbv1"/>
+    <feature name="xsave"/>
+    <feature name="xsavec"/>
+    <feature name="xsaveopt"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_IvyBridge-IBRS.xml b/src/cpu_map/x86_IvyBridge-IBRS.xml
index 430bc3232d..cd37b62cff 100644
--- a/src/cpu_map/x86_IvyBridge-IBRS.xml
+++ b/src/cpu_map/x86_IvyBridge-IBRS.xml
@@ -1,53 +1,53 @@
 <cpus>
-  <model name='IvyBridge-IBRS'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='58'/> <!-- 0306a0 -->
-    <signature family='6' model='62'/> <!-- 0306e0 -->
-    <vendor name='Intel'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='avx'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='erms'/>
-    <feature name='f16c'/>
-    <feature name='fpu'/>
-    <feature name='fsgsbase'/>
-    <feature name='fxsr'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pclmuldq'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdrand'/>
-    <feature name='rdtscp'/>
-    <feature name='sep'/>
-    <feature name='smep'/>
-    <feature name='spec-ctrl'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
-    <feature name='tsc-deadline'/>
-    <feature name='vme'/>
-    <feature name='x2apic'/>
-    <feature name='xsave'/>
+  <model name="IvyBridge-IBRS">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="58"/> <!-- 0306a0 -->
+    <signature family="6" model="62"/> <!-- 0306e0 -->
+    <vendor name="Intel"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="avx"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="erms"/>
+    <feature name="f16c"/>
+    <feature name="fpu"/>
+    <feature name="fsgsbase"/>
+    <feature name="fxsr"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pclmuldq"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdrand"/>
+    <feature name="rdtscp"/>
+    <feature name="sep"/>
+    <feature name="smep"/>
+    <feature name="spec-ctrl"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
+    <feature name="tsc-deadline"/>
+    <feature name="vme"/>
+    <feature name="x2apic"/>
+    <feature name="xsave"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_IvyBridge.xml b/src/cpu_map/x86_IvyBridge.xml
index eaf5d02e82..1718e14e13 100644
--- a/src/cpu_map/x86_IvyBridge.xml
+++ b/src/cpu_map/x86_IvyBridge.xml
@@ -1,52 +1,52 @@
 <cpus>
-  <model name='IvyBridge'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='58'/> <!-- 0306a0 -->
-    <signature family='6' model='62'/> <!-- 0306e0 -->
-    <vendor name='Intel'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='avx'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='erms'/>
-    <feature name='f16c'/>
-    <feature name='fpu'/>
-    <feature name='fsgsbase'/>
-    <feature name='fxsr'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pclmuldq'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdrand'/>
-    <feature name='rdtscp'/>
-    <feature name='sep'/>
-    <feature name='smep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
-    <feature name='tsc-deadline'/>
-    <feature name='vme'/>
-    <feature name='x2apic'/>
-    <feature name='xsave'/>
+  <model name="IvyBridge">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="58"/> <!-- 0306a0 -->
+    <signature family="6" model="62"/> <!-- 0306e0 -->
+    <vendor name="Intel"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="avx"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="erms"/>
+    <feature name="f16c"/>
+    <feature name="fpu"/>
+    <feature name="fsgsbase"/>
+    <feature name="fxsr"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pclmuldq"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdrand"/>
+    <feature name="rdtscp"/>
+    <feature name="sep"/>
+    <feature name="smep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
+    <feature name="tsc-deadline"/>
+    <feature name="vme"/>
+    <feature name="x2apic"/>
+    <feature name="xsave"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Nehalem-IBRS.xml b/src/cpu_map/x86_Nehalem-IBRS.xml
index 00d0d2fe51..9f10bf1b01 100644
--- a/src/cpu_map/x86_Nehalem-IBRS.xml
+++ b/src/cpu_map/x86_Nehalem-IBRS.xml
@@ -1,42 +1,42 @@
 <cpus>
-  <model name='Nehalem-IBRS'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='26'/> <!-- 0106a0 -->
-    <signature family='6' model='30'/> <!-- 0106e0 -->
-    <signature family='6' model='31'/> <!-- 0106f0 -->
-    <signature family='6' model='46'/> <!-- 0206e0 -->
-    <vendor name='Intel'/>
-    <feature name='apic'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='sep'/>
-    <feature name='spec-ctrl'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
+  <model name="Nehalem-IBRS">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="26"/> <!-- 0106a0 -->
+    <signature family="6" model="30"/> <!-- 0106e0 -->
+    <signature family="6" model="31"/> <!-- 0106f0 -->
+    <signature family="6" model="46"/> <!-- 0206e0 -->
+    <vendor name="Intel"/>
+    <feature name="apic"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="sep"/>
+    <feature name="spec-ctrl"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Nehalem.xml b/src/cpu_map/x86_Nehalem.xml
index 9968001fe7..bfa2224794 100644
--- a/src/cpu_map/x86_Nehalem.xml
+++ b/src/cpu_map/x86_Nehalem.xml
@@ -1,41 +1,41 @@
 <cpus>
-  <model name='Nehalem'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='26'/> <!-- 0106a0 -->
-    <signature family='6' model='30'/> <!-- 0106e0 -->
-    <signature family='6' model='31'/> <!-- 0106f0 -->
-    <signature family='6' model='46'/> <!-- 0206e0 -->
-    <vendor name='Intel'/>
-    <feature name='apic'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='sep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
+  <model name="Nehalem">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="26"/> <!-- 0106a0 -->
+    <signature family="6" model="30"/> <!-- 0106e0 -->
+    <signature family="6" model="31"/> <!-- 0106f0 -->
+    <signature family="6" model="46"/> <!-- 0206e0 -->
+    <vendor name="Intel"/>
+    <feature name="apic"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="sep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Opteron_G1.xml b/src/cpu_map/x86_Opteron_G1.xml
index 57648ca93f..cbb28aad84 100644
--- a/src/cpu_map/x86_Opteron_G1.xml
+++ b/src/cpu_map/x86_Opteron_G1.xml
@@ -1,32 +1,32 @@
 <cpus>
-  <model name='Opteron_G1'>
-    <decode host='on' guest='on'/>
-    <signature family='15' model='6'/> <!-- 100e60 -->
-    <vendor name='AMD'/>
-    <feature name='apic'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='sep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
+  <model name="Opteron_G1">
+    <decode host="on" guest="on"/>
+    <signature family="15" model="6"/> <!-- 100e60 -->
+    <vendor name="AMD"/>
+    <feature name="apic"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="sep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Opteron_G2.xml b/src/cpu_map/x86_Opteron_G2.xml
index db961b0067..4888d8ec4b 100644
--- a/src/cpu_map/x86_Opteron_G2.xml
+++ b/src/cpu_map/x86_Opteron_G2.xml
@@ -1,36 +1,36 @@
 <cpus>
-  <model name='Opteron_G2'>
-    <decode host='on' guest='on'/>
-    <signature family='15' model='6'/> <!-- 100e60 -->
-    <vendor name='AMD'/>
-    <feature name='apic'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdtscp'/>
-    <feature name='sep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='svm'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
+  <model name="Opteron_G2">
+    <decode host="on" guest="on"/>
+    <signature family="15" model="6"/> <!-- 100e60 -->
+    <vendor name="AMD"/>
+    <feature name="apic"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdtscp"/>
+    <feature name="sep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="svm"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Opteron_G3.xml b/src/cpu_map/x86_Opteron_G3.xml
index dab59d4f82..7dd0eb99ed 100644
--- a/src/cpu_map/x86_Opteron_G3.xml
+++ b/src/cpu_map/x86_Opteron_G3.xml
@@ -1,41 +1,41 @@
 <cpus>
-  <model name='Opteron_G3'>
-    <decode host='on' guest='on'/>
-    <signature family='15' model='6'/> <!-- 100e60 -->
-    <vendor name='AMD'/>
-    <feature name='abm'/>
-    <feature name='apic'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='misalignsse'/>
-    <feature name='mmx'/>
-    <feature name='monitor'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdtscp'/>
-    <feature name='sep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4a'/>
-    <feature name='svm'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
+  <model name="Opteron_G3">
+    <decode host="on" guest="on"/>
+    <signature family="15" model="6"/> <!-- 100e60 -->
+    <vendor name="AMD"/>
+    <feature name="abm"/>
+    <feature name="apic"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="misalignsse"/>
+    <feature name="mmx"/>
+    <feature name="monitor"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdtscp"/>
+    <feature name="sep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4a"/>
+    <feature name="svm"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Opteron_G4.xml b/src/cpu_map/x86_Opteron_G4.xml
index a7fc8d5828..2b6e986839 100644
--- a/src/cpu_map/x86_Opteron_G4.xml
+++ b/src/cpu_map/x86_Opteron_G4.xml
@@ -1,51 +1,51 @@
 <cpus>
-  <model name='Opteron_G4'>
-    <decode host='on' guest='on'/>
-    <signature family='21' model='1'/> <!-- 600f10 -->
-    <vendor name='AMD'/>
-    <feature name='3dnowprefetch'/>
-    <feature name='abm'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='avx'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fma4'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='misalignsse'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pclmuldq'/>
-    <feature name='pdpe1gb'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdtscp'/>
-    <feature name='sep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='sse4a'/>
-    <feature name='ssse3'/>
-    <feature name='svm'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
-    <feature name='xop'/>
-    <feature name='xsave'/>
+  <model name="Opteron_G4">
+    <decode host="on" guest="on"/>
+    <signature family="21" model="1"/> <!-- 600f10 -->
+    <vendor name="AMD"/>
+    <feature name="3dnowprefetch"/>
+    <feature name="abm"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="avx"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fma4"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="misalignsse"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pclmuldq"/>
+    <feature name="pdpe1gb"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdtscp"/>
+    <feature name="sep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="sse4a"/>
+    <feature name="ssse3"/>
+    <feature name="svm"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
+    <feature name="xop"/>
+    <feature name="xsave"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Opteron_G5.xml b/src/cpu_map/x86_Opteron_G5.xml
index ff775bdcef..9827161a54 100644
--- a/src/cpu_map/x86_Opteron_G5.xml
+++ b/src/cpu_map/x86_Opteron_G5.xml
@@ -1,54 +1,54 @@
 <cpus>
-  <model name='Opteron_G5'>
-    <decode host='on' guest='on'/>
-    <signature family='21' model='2'/> <!-- 600f20 -->
-    <vendor name='AMD'/>
-    <feature name='3dnowprefetch'/>
-    <feature name='abm'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='avx'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='f16c'/>
-    <feature name='fma'/>
-    <feature name='fma4'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='misalignsse'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pclmuldq'/>
-    <feature name='pdpe1gb'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdtscp'/>
-    <feature name='sep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='sse4a'/>
-    <feature name='ssse3'/>
-    <feature name='svm'/>
-    <feature name='syscall'/>
-    <feature name='tbm'/>
-    <feature name='tsc'/>
-    <feature name='xop'/>
-    <feature name='xsave'/>
+  <model name="Opteron_G5">
+    <decode host="on" guest="on"/>
+    <signature family="21" model="2"/> <!-- 600f20 -->
+    <vendor name="AMD"/>
+    <feature name="3dnowprefetch"/>
+    <feature name="abm"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="avx"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="f16c"/>
+    <feature name="fma"/>
+    <feature name="fma4"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="misalignsse"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pclmuldq"/>
+    <feature name="pdpe1gb"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdtscp"/>
+    <feature name="sep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="sse4a"/>
+    <feature name="ssse3"/>
+    <feature name="svm"/>
+    <feature name="syscall"/>
+    <feature name="tbm"/>
+    <feature name="tsc"/>
+    <feature name="xop"/>
+    <feature name="xsave"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Penryn.xml b/src/cpu_map/x86_Penryn.xml
index 29d4cd635b..9b756f758b 100644
--- a/src/cpu_map/x86_Penryn.xml
+++ b/src/cpu_map/x86_Penryn.xml
@@ -1,37 +1,37 @@
 <cpus>
-  <model name='Penryn'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='23'/> <!-- 010670 -->
-    <signature family='6' model='29'/> <!-- 0106d0 -->
-    <vendor name='Intel'/>
-    <feature name='apic'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='sep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
+  <model name="Penryn">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="23"/> <!-- 010670 -->
+    <signature family="6" model="29"/> <!-- 0106d0 -->
+    <vendor name="Intel"/>
+    <feature name="apic"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="sep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_SandyBridge-IBRS.xml b/src/cpu_map/x86_SandyBridge-IBRS.xml
index fbdb4f2bf6..995b00db11 100644
--- a/src/cpu_map/x86_SandyBridge-IBRS.xml
+++ b/src/cpu_map/x86_SandyBridge-IBRS.xml
@@ -1,47 +1,47 @@
 <cpus>
-  <model name='SandyBridge-IBRS'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='42'/> <!-- 0206a0 -->
-    <signature family='6' model='45'/> <!-- 0206d0 -->
-    <vendor name='Intel'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='avx'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pclmuldq'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdtscp'/>
-    <feature name='sep'/>
-    <feature name='spec-ctrl'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
-    <feature name='tsc-deadline'/>
-    <feature name='x2apic'/>
-    <feature name='xsave'/>
+  <model name="SandyBridge-IBRS">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="42"/> <!-- 0206a0 -->
+    <signature family="6" model="45"/> <!-- 0206d0 -->
+    <vendor name="Intel"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="avx"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pclmuldq"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdtscp"/>
+    <feature name="sep"/>
+    <feature name="spec-ctrl"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
+    <feature name="tsc-deadline"/>
+    <feature name="x2apic"/>
+    <feature name="xsave"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_SandyBridge.xml b/src/cpu_map/x86_SandyBridge.xml
index 7c85ed42df..c4e2f28ec0 100644
--- a/src/cpu_map/x86_SandyBridge.xml
+++ b/src/cpu_map/x86_SandyBridge.xml
@@ -1,46 +1,46 @@
 <cpus>
-  <model name='SandyBridge'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='42'/> <!-- 0206a0 -->
-    <signature family='6' model='45'/> <!-- 0206d0 -->
-    <vendor name='Intel'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='avx'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pclmuldq'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdtscp'/>
-    <feature name='sep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
-    <feature name='tsc-deadline'/>
-    <feature name='x2apic'/>
-    <feature name='xsave'/>
+  <model name="SandyBridge">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="42"/> <!-- 0206a0 -->
+    <signature family="6" model="45"/> <!-- 0206d0 -->
+    <vendor name="Intel"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="avx"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pclmuldq"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdtscp"/>
+    <feature name="sep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
+    <feature name="tsc-deadline"/>
+    <feature name="x2apic"/>
+    <feature name="xsave"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Skylake-Client-IBRS.xml b/src/cpu_map/x86_Skylake-Client-IBRS.xml
index 5709e7c2f9..768221d5c6 100644
--- a/src/cpu_map/x86_Skylake-Client-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Client-IBRS.xml
@@ -1,76 +1,76 @@
 <cpus>
-  <model name='Skylake-Client-IBRS'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='94'/> <!-- 0506e0 -->
-    <signature family='6' model='78'/> <!-- 0406e0 -->
+  <model name="Skylake-Client-IBRS">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="94"/> <!-- 0506e0 -->
+    <signature family="6" model="78"/> <!-- 0406e0 -->
     <!-- These are Kaby Lake and Coffee Lake successors to Skylake,
          but we don't have specific models for them. -->
-    <signature family='6' model='142'/> <!-- 0806e0 -->
-    <signature family='6' model='158'/> <!-- 0906e0 -->
-    <vendor name='Intel'/>
-    <feature name='3dnowprefetch'/>
-    <feature name='abm'/>
-    <feature name='adx'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='arat'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <feature name='bmi1'/>
-    <feature name='bmi2'/>
-    <feature name='clflush'/>
-    <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='invpcid'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='movbe'/>
-    <feature name='mpx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pcid'/>
-    <feature name='pclmuldq'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdrand'/>
-    <feature name='rdseed'/>
-    <feature name='rdtscp'/>
-    <feature name='rtm'/>
-    <feature name='sep'/>
-    <feature name='smap'/>
-    <feature name='smep'/>
-    <feature name='spec-ctrl'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <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'/>
+    <signature family="6" model="142"/> <!-- 0806e0 -->
+    <signature family="6" model="158"/> <!-- 0906e0 -->
+    <vendor name="Intel"/>
+    <feature name="3dnowprefetch"/>
+    <feature name="abm"/>
+    <feature name="adx"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="arat"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <feature name="bmi1"/>
+    <feature name="bmi2"/>
+    <feature name="clflush"/>
+    <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="invpcid"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="movbe"/>
+    <feature name="mpx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pcid"/>
+    <feature name="pclmuldq"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdrand"/>
+    <feature name="rdseed"/>
+    <feature name="rdtscp"/>
+    <feature name="rtm"/>
+    <feature name="sep"/>
+    <feature name="smap"/>
+    <feature name="smep"/>
+    <feature name="spec-ctrl"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <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>
diff --git a/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml b/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
index ffba34502a..2df69661a4 100644
--- a/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
@@ -1,74 +1,74 @@
 <cpus>
-  <model name='Skylake-Client-noTSX-IBRS'>
-    <decode host='on' guest='off'/>
-    <signature family='6' model='94'/> <!-- 0506e0 -->
-    <signature family='6' model='78'/> <!-- 0406e0 -->
+  <model name="Skylake-Client-noTSX-IBRS">
+    <decode host="on" guest="off"/>
+    <signature family="6" model="94"/> <!-- 0506e0 -->
+    <signature family="6" model="78"/> <!-- 0406e0 -->
     <!-- These are Kaby Lake and Coffee Lake successors to Skylake,
          but we don't have specific models for them. -->
-    <signature family='6' model='142'/> <!-- 0806e0 -->
-    <signature family='6' model='158'/> <!-- 0906e0 -->
-    <vendor name='Intel'/>
-    <feature name='3dnowprefetch'/>
-    <feature name='abm'/>
-    <feature name='adx'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='arat'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <feature name='bmi1'/>
-    <feature name='bmi2'/>
-    <feature name='clflush'/>
-    <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='invpcid'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='movbe'/>
-    <feature name='mpx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pcid'/>
-    <feature name='pclmuldq'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdrand'/>
-    <feature name='rdseed'/>
-    <feature name='rdtscp'/>
-    <feature name='sep'/>
-    <feature name='smap'/>
-    <feature name='smep'/>
-    <feature name='spec-ctrl'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <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'/>
+    <signature family="6" model="142"/> <!-- 0806e0 -->
+    <signature family="6" model="158"/> <!-- 0906e0 -->
+    <vendor name="Intel"/>
+    <feature name="3dnowprefetch"/>
+    <feature name="abm"/>
+    <feature name="adx"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="arat"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <feature name="bmi1"/>
+    <feature name="bmi2"/>
+    <feature name="clflush"/>
+    <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="invpcid"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="movbe"/>
+    <feature name="mpx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pcid"/>
+    <feature name="pclmuldq"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdrand"/>
+    <feature name="rdseed"/>
+    <feature name="rdtscp"/>
+    <feature name="sep"/>
+    <feature name="smap"/>
+    <feature name="smep"/>
+    <feature name="spec-ctrl"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <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>
diff --git a/src/cpu_map/x86_Skylake-Client.xml b/src/cpu_map/x86_Skylake-Client.xml
index 14cd57e176..d0e034ee90 100644
--- a/src/cpu_map/x86_Skylake-Client.xml
+++ b/src/cpu_map/x86_Skylake-Client.xml
@@ -1,75 +1,75 @@
 <cpus>
-  <model name='Skylake-Client'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='94'/> <!-- 0506e0 -->
-    <signature family='6' model='78'/> <!-- 0406e0 -->
+  <model name="Skylake-Client">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="94"/> <!-- 0506e0 -->
+    <signature family="6" model="78"/> <!-- 0406e0 -->
     <!-- These are Kaby Lake and Coffee Lake successors to Skylake,
          but we don't have specific models for them. -->
-    <signature family='6' model='142'/> <!-- 0806e0 -->
-    <signature family='6' model='158'/> <!-- 0906e0 -->
-    <vendor name='Intel'/>
-    <feature name='3dnowprefetch'/>
-    <feature name='abm'/>
-    <feature name='adx'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='arat'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <feature name='bmi1'/>
-    <feature name='bmi2'/>
-    <feature name='clflush'/>
-    <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='invpcid'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='movbe'/>
-    <feature name='mpx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pcid'/>
-    <feature name='pclmuldq'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdrand'/>
-    <feature name='rdseed'/>
-    <feature name='rdtscp'/>
-    <feature name='rtm'/>
-    <feature name='sep'/>
-    <feature name='smap'/>
-    <feature name='smep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <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'/>
+    <signature family="6" model="142"/> <!-- 0806e0 -->
+    <signature family="6" model="158"/> <!-- 0906e0 -->
+    <vendor name="Intel"/>
+    <feature name="3dnowprefetch"/>
+    <feature name="abm"/>
+    <feature name="adx"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="arat"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <feature name="bmi1"/>
+    <feature name="bmi2"/>
+    <feature name="clflush"/>
+    <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="invpcid"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="movbe"/>
+    <feature name="mpx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pcid"/>
+    <feature name="pclmuldq"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdrand"/>
+    <feature name="rdseed"/>
+    <feature name="rdtscp"/>
+    <feature name="rtm"/>
+    <feature name="sep"/>
+    <feature name="smap"/>
+    <feature name="smep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <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>
diff --git a/src/cpu_map/x86_Skylake-Server-IBRS.xml b/src/cpu_map/x86_Skylake-Server-IBRS.xml
index 9fb3488809..47cdc5541f 100644
--- a/src/cpu_map/x86_Skylake-Server-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Server-IBRS.xml
@@ -1,78 +1,78 @@
 <cpus>
-  <model name='Skylake-Server-IBRS'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='85' stepping='0-4'/> <!-- 050654 -->
-    <vendor name='Intel'/>
-    <feature name='3dnowprefetch'/>
-    <feature name='abm'/>
-    <feature name='adx'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='arat'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <feature name='avx512bw'/>
-    <feature name='avx512cd'/>
-    <feature name='avx512dq'/>
-    <feature name='avx512f'/>
-    <feature name='avx512vl'/>
-    <feature name='bmi1'/>
-    <feature name='bmi2'/>
-    <feature name='clflush'/>
-    <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='invpcid'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='movbe'/>
-    <feature name='mpx'/>
-    <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='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdrand'/>
-    <feature name='rdseed'/>
-    <feature name='rdtscp'/>
-    <feature name='rtm'/>
-    <feature name='sep'/>
-    <feature name='smap'/>
-    <feature name='smep'/>
-    <feature name='spec-ctrl'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <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 name="Skylake-Server-IBRS">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="85" stepping="0-4"/> <!-- 050654 -->
+    <vendor name="Intel"/>
+    <feature name="3dnowprefetch"/>
+    <feature name="abm"/>
+    <feature name="adx"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="arat"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <feature name="avx512bw"/>
+    <feature name="avx512cd"/>
+    <feature name="avx512dq"/>
+    <feature name="avx512f"/>
+    <feature name="avx512vl"/>
+    <feature name="bmi1"/>
+    <feature name="bmi2"/>
+    <feature name="clflush"/>
+    <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="invpcid"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="movbe"/>
+    <feature name="mpx"/>
+    <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="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdrand"/>
+    <feature name="rdseed"/>
+    <feature name="rdtscp"/>
+    <feature name="rtm"/>
+    <feature name="sep"/>
+    <feature name="smap"/>
+    <feature name="smep"/>
+    <feature name="spec-ctrl"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <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>
diff --git a/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml b/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
index c162c0acc3..5338f6bcf8 100644
--- a/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
@@ -1,76 +1,76 @@
 <cpus>
-  <model name='Skylake-Server-noTSX-IBRS'>
-    <decode host='on' guest='off'/>
-    <signature family='6' model='85' stepping='0-4'/> <!-- 050654 -->
-    <vendor name='Intel'/>
-    <feature name='3dnowprefetch'/>
-    <feature name='abm'/>
-    <feature name='adx'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='arat'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <feature name='avx512bw'/>
-    <feature name='avx512cd'/>
-    <feature name='avx512dq'/>
-    <feature name='avx512f'/>
-    <feature name='avx512vl'/>
-    <feature name='bmi1'/>
-    <feature name='bmi2'/>
-    <feature name='clflush'/>
-    <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='invpcid'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='movbe'/>
-    <feature name='mpx'/>
-    <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='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdrand'/>
-    <feature name='rdseed'/>
-    <feature name='rdtscp'/>
-    <feature name='sep'/>
-    <feature name='smap'/>
-    <feature name='smep'/>
-    <feature name='spec-ctrl'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <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 name="Skylake-Server-noTSX-IBRS">
+    <decode host="on" guest="off"/>
+    <signature family="6" model="85" stepping="0-4"/> <!-- 050654 -->
+    <vendor name="Intel"/>
+    <feature name="3dnowprefetch"/>
+    <feature name="abm"/>
+    <feature name="adx"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="arat"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <feature name="avx512bw"/>
+    <feature name="avx512cd"/>
+    <feature name="avx512dq"/>
+    <feature name="avx512f"/>
+    <feature name="avx512vl"/>
+    <feature name="bmi1"/>
+    <feature name="bmi2"/>
+    <feature name="clflush"/>
+    <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="invpcid"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="movbe"/>
+    <feature name="mpx"/>
+    <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="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdrand"/>
+    <feature name="rdseed"/>
+    <feature name="rdtscp"/>
+    <feature name="sep"/>
+    <feature name="smap"/>
+    <feature name="smep"/>
+    <feature name="spec-ctrl"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <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>
diff --git a/src/cpu_map/x86_Skylake-Server.xml b/src/cpu_map/x86_Skylake-Server.xml
index e022d94c84..a608573740 100644
--- a/src/cpu_map/x86_Skylake-Server.xml
+++ b/src/cpu_map/x86_Skylake-Server.xml
@@ -1,77 +1,77 @@
 <cpus>
-  <model name='Skylake-Server'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='85' stepping='0-4'/> <!-- 050654 -->
-    <vendor name='Intel'/>
-    <feature name='3dnowprefetch'/>
-    <feature name='abm'/>
-    <feature name='adx'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='arat'/>
-    <feature name='avx'/>
-    <feature name='avx2'/>
-    <feature name='avx512bw'/>
-    <feature name='avx512cd'/>
-    <feature name='avx512dq'/>
-    <feature name='avx512f'/>
-    <feature name='avx512vl'/>
-    <feature name='bmi1'/>
-    <feature name='bmi2'/>
-    <feature name='clflush'/>
-    <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='invpcid'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='movbe'/>
-    <feature name='mpx'/>
-    <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='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='rdrand'/>
-    <feature name='rdseed'/>
-    <feature name='rdtscp'/>
-    <feature name='rtm'/>
-    <feature name='sep'/>
-    <feature name='smap'/>
-    <feature name='smep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <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 name="Skylake-Server">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="85" stepping="0-4"/> <!-- 050654 -->
+    <vendor name="Intel"/>
+    <feature name="3dnowprefetch"/>
+    <feature name="abm"/>
+    <feature name="adx"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="arat"/>
+    <feature name="avx"/>
+    <feature name="avx2"/>
+    <feature name="avx512bw"/>
+    <feature name="avx512cd"/>
+    <feature name="avx512dq"/>
+    <feature name="avx512f"/>
+    <feature name="avx512vl"/>
+    <feature name="bmi1"/>
+    <feature name="bmi2"/>
+    <feature name="clflush"/>
+    <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="invpcid"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="movbe"/>
+    <feature name="mpx"/>
+    <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="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="rdrand"/>
+    <feature name="rdseed"/>
+    <feature name="rdtscp"/>
+    <feature name="rtm"/>
+    <feature name="sep"/>
+    <feature name="smap"/>
+    <feature name="smep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <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>
diff --git a/src/cpu_map/x86_Westmere-IBRS.xml b/src/cpu_map/x86_Westmere-IBRS.xml
index c7898f0c22..2e4bfd171d 100644
--- a/src/cpu_map/x86_Westmere-IBRS.xml
+++ b/src/cpu_map/x86_Westmere-IBRS.xml
@@ -1,40 +1,40 @@
 <cpus>
-  <model name='Westmere-IBRS'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='44'/> <!-- 0206c0 -->
-    <vendor name='Intel'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='sep'/>
-    <feature name='spec-ctrl'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
+  <model name="Westmere-IBRS">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="44"/> <!-- 0206c0 -->
+    <vendor name="Intel"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="sep"/>
+    <feature name="spec-ctrl"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Westmere.xml b/src/cpu_map/x86_Westmere.xml
index 16e4ad6c30..259b6c75ee 100644
--- a/src/cpu_map/x86_Westmere.xml
+++ b/src/cpu_map/x86_Westmere.xml
@@ -1,41 +1,41 @@
 <cpus>
-  <model name='Westmere'>
-    <decode host='on' guest='on'/>
-    <signature family='6' model='44'/> <!-- 0206c0 -->
-    <signature family='6' model='47'/> <!-- 0206f0 -->
-    <signature family='6' model='37'/> <!-- 020650 -->
-    <vendor name='Intel'/>
-    <feature name='aes'/>
-    <feature name='apic'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='popcnt'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='sep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='sse4.1'/>
-    <feature name='sse4.2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
+  <model name="Westmere">
+    <decode host="on" guest="on"/>
+    <signature family="6" model="44"/> <!-- 0206c0 -->
+    <signature family="6" model="47"/> <!-- 0206f0 -->
+    <signature family="6" model="37"/> <!-- 020650 -->
+    <vendor name="Intel"/>
+    <feature name="aes"/>
+    <feature name="apic"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="popcnt"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="sep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="sse4.1"/>
+    <feature name="sse4.2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_athlon.xml b/src/cpu_map/x86_athlon.xml
index 81c43c81e8..7ae992c491 100644
--- a/src/cpu_map/x86_athlon.xml
+++ b/src/cpu_map/x86_athlon.xml
@@ -1,29 +1,29 @@
 <cpus>
-  <model name='athlon'>
-    <decode host='on' guest='on'/>
-    <vendor name='AMD'/>
-    <feature name='3dnow'/>
-    <feature name='3dnowext'/>
-    <feature name='apic'/>
-    <feature name='cmov'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='mmxext'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pge'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='sep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='tsc'/>
-    <feature name='vme'/>
+  <model name="athlon">
+    <decode host="on" guest="on"/>
+    <vendor name="AMD"/>
+    <feature name="3dnow"/>
+    <feature name="3dnowext"/>
+    <feature name="apic"/>
+    <feature name="cmov"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="mmxext"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pge"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="sep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="tsc"/>
+    <feature name="vme"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_core2duo.xml b/src/cpu_map/x86_core2duo.xml
index 412039fe55..e22b183b42 100644
--- a/src/cpu_map/x86_core2duo.xml
+++ b/src/cpu_map/x86_core2duo.xml
@@ -1,34 +1,34 @@
 <cpus>
-  <model name='core2duo'>
-    <decode host='on' guest='on'/>
-    <vendor name='Intel'/>
-    <feature name='apic'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='monitor'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='sep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='ssse3'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
-    <feature name='vme'/>
+  <model name="core2duo">
+    <decode host="on" guest="on"/>
+    <vendor name="Intel"/>
+    <feature name="apic"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="monitor"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="sep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="ssse3"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
+    <feature name="vme"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_coreduo.xml b/src/cpu_map/x86_coreduo.xml
index e2fda9a1d4..d9888beb51 100644
--- a/src/cpu_map/x86_coreduo.xml
+++ b/src/cpu_map/x86_coreduo.xml
@@ -1,30 +1,30 @@
 <cpus>
-  <model name='coreduo'>
-    <decode host='on' guest='on'/>
-    <vendor name='Intel'/>
-    <feature name='apic'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='monitor'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='pse'/>
-    <feature name='sep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='tsc'/>
-    <feature name='vme'/>
+  <model name="coreduo">
+    <decode host="on" guest="on"/>
+    <vendor name="Intel"/>
+    <feature name="apic"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="monitor"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="pse"/>
+    <feature name="sep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="tsc"/>
+    <feature name="vme"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_cpu64-rhel5.xml b/src/cpu_map/x86_cpu64-rhel5.xml
index be6bcdb7a6..76bb42ca2a 100644
--- a/src/cpu_map/x86_cpu64-rhel5.xml
+++ b/src/cpu_map/x86_cpu64-rhel5.xml
@@ -1,30 +1,30 @@
 <cpus>
-  <model name='cpu64-rhel5'>
-    <decode host='on' guest='on'/>
-    <feature name='apic'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='sep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
+  <model name="cpu64-rhel5">
+    <decode host="on" guest="on"/>
+    <feature name="apic"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="sep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_cpu64-rhel6.xml b/src/cpu_map/x86_cpu64-rhel6.xml
index c62b1b5575..ab65469a68 100644
--- a/src/cpu_map/x86_cpu64-rhel6.xml
+++ b/src/cpu_map/x86_cpu64-rhel6.xml
@@ -1,32 +1,32 @@
 <cpus>
-  <model name='cpu64-rhel6'>
-    <decode host='on' guest='on'/>
-    <feature name='apic'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='lahf_lm'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='sep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
+  <model name="cpu64-rhel6">
+    <decode host="on" guest="on"/>
+    <feature name="apic"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="lahf_lm"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="sep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index a55f52b16c..54ad1cf9b1 100644
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -7,572 +7,572 @@
 -->
 <cpus>
   <!-- standard features, EDX -->
-  <feature name='fpu'>
-    <cpuid eax_in='0x01' edx='0x00000001'/>
+  <feature name="fpu">
+    <cpuid eax_in="0x01" edx="0x00000001"/>
   </feature>
-  <feature name='vme'>
-    <cpuid eax_in='0x01' edx='0x00000002'/>
+  <feature name="vme">
+    <cpuid eax_in="0x01" edx="0x00000002"/>
   </feature>
-  <feature name='de'>
-    <cpuid eax_in='0x01' edx='0x00000004'/>
+  <feature name="de">
+    <cpuid eax_in="0x01" edx="0x00000004"/>
   </feature>
-  <feature name='pse'>
-    <cpuid eax_in='0x01' edx='0x00000008'/>
+  <feature name="pse">
+    <cpuid eax_in="0x01" edx="0x00000008"/>
   </feature>
-  <feature name='tsc'>
-    <cpuid eax_in='0x01' edx='0x00000010'/>
+  <feature name="tsc">
+    <cpuid eax_in="0x01" edx="0x00000010"/>
   </feature>
-  <feature name='msr'>
-    <cpuid eax_in='0x01' edx='0x00000020'/>
+  <feature name="msr">
+    <cpuid eax_in="0x01" edx="0x00000020"/>
   </feature>
-  <feature name='pae'>
-    <cpuid eax_in='0x01' edx='0x00000040'/>
+  <feature name="pae">
+    <cpuid eax_in="0x01" edx="0x00000040"/>
   </feature>
-  <feature name='mce'>
-    <cpuid eax_in='0x01' edx='0x00000080'/>
+  <feature name="mce">
+    <cpuid eax_in="0x01" edx="0x00000080"/>
   </feature>
-  <feature name='cx8'>
-    <cpuid eax_in='0x01' edx='0x00000100'/>
+  <feature name="cx8">
+    <cpuid eax_in="0x01" edx="0x00000100"/>
   </feature>
-  <feature name='apic'>
-    <cpuid eax_in='0x01' edx='0x00000200'/>
+  <feature name="apic">
+    <cpuid eax_in="0x01" edx="0x00000200"/>
   </feature>
-  <feature name='sep'>
-    <cpuid eax_in='0x01' edx='0x00000800'/>
+  <feature name="sep">
+    <cpuid eax_in="0x01" edx="0x00000800"/>
   </feature>
-  <feature name='mtrr'>
-    <cpuid eax_in='0x01' edx='0x00001000'/>
+  <feature name="mtrr">
+    <cpuid eax_in="0x01" edx="0x00001000"/>
   </feature>
-  <feature name='pge'>
-    <cpuid eax_in='0x01' edx='0x00002000'/>
+  <feature name="pge">
+    <cpuid eax_in="0x01" edx="0x00002000"/>
   </feature>
-  <feature name='mca'>
-    <cpuid eax_in='0x01' edx='0x00004000'/>
+  <feature name="mca">
+    <cpuid eax_in="0x01" edx="0x00004000"/>
   </feature>
-  <feature name='cmov'>
-    <cpuid eax_in='0x01' edx='0x00008000'/>
+  <feature name="cmov">
+    <cpuid eax_in="0x01" edx="0x00008000"/>
   </feature>
-  <feature name='pat'>
-    <cpuid eax_in='0x01' edx='0x00010000'/>
+  <feature name="pat">
+    <cpuid eax_in="0x01" edx="0x00010000"/>
   </feature>
-  <feature name='pse36'>
-    <cpuid eax_in='0x01' edx='0x00020000'/>
+  <feature name="pse36">
+    <cpuid eax_in="0x01" edx="0x00020000"/>
   </feature>
-  <feature name='pn'>
-    <cpuid eax_in='0x01' edx='0x00040000'/>
+  <feature name="pn">
+    <cpuid eax_in="0x01" edx="0x00040000"/>
   </feature>
-  <feature name='clflush'>
-    <cpuid eax_in='0x01' edx='0x00080000'/>
+  <feature name="clflush">
+    <cpuid eax_in="0x01" edx="0x00080000"/>
   </feature>
-  <feature name='ds'>
-    <cpuid eax_in='0x01' edx='0x00200000'/>
+  <feature name="ds">
+    <cpuid eax_in="0x01" edx="0x00200000"/>
   </feature>
-  <feature name='acpi'>
-    <cpuid eax_in='0x01' edx='0x00400000'/>
+  <feature name="acpi">
+    <cpuid eax_in="0x01" edx="0x00400000"/>
   </feature>
-  <feature name='mmx'>
-    <cpuid eax_in='0x01' edx='0x00800000'/>
+  <feature name="mmx">
+    <cpuid eax_in="0x01" edx="0x00800000"/>
   </feature>
-  <feature name='fxsr'>
-    <cpuid eax_in='0x01' edx='0x01000000'/>
+  <feature name="fxsr">
+    <cpuid eax_in="0x01" edx="0x01000000"/>
   </feature>
-  <feature name='sse'>
-    <cpuid eax_in='0x01' edx='0x02000000'/>
+  <feature name="sse">
+    <cpuid eax_in="0x01" edx="0x02000000"/>
   </feature>
-  <feature name='sse2'>
-    <cpuid eax_in='0x01' edx='0x04000000'/>
+  <feature name="sse2">
+    <cpuid eax_in="0x01" edx="0x04000000"/>
   </feature>
-  <feature name='ss'>
-    <cpuid eax_in='0x01' edx='0x08000000'/>
+  <feature name="ss">
+    <cpuid eax_in="0x01" edx="0x08000000"/>
   </feature>
-  <feature name='ht'>
-    <cpuid eax_in='0x01' edx='0x10000000'/>
+  <feature name="ht">
+    <cpuid eax_in="0x01" edx="0x10000000"/>
   </feature>
-  <feature name='tm'>
-    <cpuid eax_in='0x01' edx='0x20000000'/>
+  <feature name="tm">
+    <cpuid eax_in="0x01" edx="0x20000000"/>
   </feature>
-  <feature name='ia64'>
-    <cpuid eax_in='0x01' edx='0x40000000'/>
+  <feature name="ia64">
+    <cpuid eax_in="0x01" edx="0x40000000"/>
   </feature>
-  <feature name='pbe'>
-    <cpuid eax_in='0x01' edx='0x80000000'/>
+  <feature name="pbe">
+    <cpuid eax_in="0x01" edx="0x80000000"/>
   </feature>
 
   <!-- standard features, ECX -->
-  <feature name='pni'> <!-- sse3 -->
-    <cpuid eax_in='0x01' ecx='0x00000001'/>
+  <feature name="pni"> <!-- sse3 -->
+    <cpuid eax_in="0x01" ecx="0x00000001"/>
   </feature>
-  <feature name='pclmuldq'> <!-- pclmulqdq -->
-    <cpuid eax_in='0x01' ecx='0x00000002'/>
+  <feature name="pclmuldq"> <!-- pclmulqdq -->
+    <cpuid eax_in="0x01" ecx="0x00000002"/>
   </feature>
-  <feature name='dtes64'>
-    <cpuid eax_in='0x01' ecx='0x00000004'/>
+  <feature name="dtes64">
+    <cpuid eax_in="0x01" ecx="0x00000004"/>
   </feature>
-  <feature name='monitor'>
-    <cpuid eax_in='0x01' ecx='0x00000008'/>
+  <feature name="monitor">
+    <cpuid eax_in="0x01" ecx="0x00000008"/>
   </feature>
-  <feature name='ds_cpl'> <!-- ds-cpl -->
-    <cpuid eax_in='0x01' ecx='0x00000010'/>
+  <feature name="ds_cpl"> <!-- ds-cpl -->
+    <cpuid eax_in="0x01" ecx="0x00000010"/>
   </feature>
-  <feature name='vmx'>
-    <cpuid eax_in='0x01' ecx='0x00000020'/>
+  <feature name="vmx">
+    <cpuid eax_in="0x01" ecx="0x00000020"/>
   </feature>
-  <feature name='smx'>
-    <cpuid eax_in='0x01' ecx='0x00000040'/>
+  <feature name="smx">
+    <cpuid eax_in="0x01" ecx="0x00000040"/>
   </feature>
-  <feature name='est'>
-    <cpuid eax_in='0x01' ecx='0x00000080'/>
+  <feature name="est">
+    <cpuid eax_in="0x01" ecx="0x00000080"/>
   </feature>
-  <feature name='tm2'>
-    <cpuid eax_in='0x01' ecx='0x00000100'/>
+  <feature name="tm2">
+    <cpuid eax_in="0x01" ecx="0x00000100"/>
   </feature>
-  <feature name='ssse3'>
-    <cpuid eax_in='0x01' ecx='0x00000200'/>
+  <feature name="ssse3">
+    <cpuid eax_in="0x01" ecx="0x00000200"/>
   </feature>
-  <feature name='cid'>
-    <cpuid eax_in='0x01' ecx='0x00000400'/>
+  <feature name="cid">
+    <cpuid eax_in="0x01" ecx="0x00000400"/>
   </feature>
-  <feature name='fma'>
-    <cpuid eax_in='0x01' ecx='0x00001000'/>
+  <feature name="fma">
+    <cpuid eax_in="0x01" ecx="0x00001000"/>
   </feature>
-  <feature name='cx16'>
-    <cpuid eax_in='0x01' ecx='0x00002000'/>
+  <feature name="cx16">
+    <cpuid eax_in="0x01" ecx="0x00002000"/>
   </feature>
-  <feature name='xtpr'>
-    <cpuid eax_in='0x01' ecx='0x00004000'/>
+  <feature name="xtpr">
+    <cpuid eax_in="0x01" ecx="0x00004000"/>
   </feature>
-  <feature name='pdcm'>
-    <cpuid eax_in='0x01' ecx='0x00008000'/>
+  <feature name="pdcm">
+    <cpuid eax_in="0x01" ecx="0x00008000"/>
   </feature>
-  <feature name='pcid'>
-    <cpuid eax_in='0x01' ecx='0x00020000'/>
+  <feature name="pcid">
+    <cpuid eax_in="0x01" ecx="0x00020000"/>
   </feature>
-  <feature name='dca'>
-    <cpuid eax_in='0x01' ecx='0x00040000'/>
+  <feature name="dca">
+    <cpuid eax_in="0x01" ecx="0x00040000"/>
   </feature>
-  <feature name='sse4.1'> <!-- sse4-1, sse4_1 -->
-    <cpuid eax_in='0x01' ecx='0x00080000'/>
+  <feature name="sse4.1"> <!-- sse4-1, sse4_1 -->
+    <cpuid eax_in="0x01" ecx="0x00080000"/>
   </feature>
-  <feature name='sse4.2'> <!-- sse4-2, sse4_2 -->
-    <cpuid eax_in='0x01' ecx='0x00100000'/>
+  <feature name="sse4.2"> <!-- sse4-2, sse4_2 -->
+    <cpuid eax_in="0x01" ecx="0x00100000"/>
   </feature>
-  <feature name='x2apic'>
-    <cpuid eax_in='0x01' ecx='0x00200000'/>
+  <feature name="x2apic">
+    <cpuid eax_in="0x01" ecx="0x00200000"/>
   </feature>
-  <feature name='movbe'>
-    <cpuid eax_in='0x01' ecx='0x00400000'/>
+  <feature name="movbe">
+    <cpuid eax_in="0x01" ecx="0x00400000"/>
   </feature>
-  <feature name='popcnt'>
-    <cpuid eax_in='0x01' ecx='0x00800000'/>
+  <feature name="popcnt">
+    <cpuid eax_in="0x01" ecx="0x00800000"/>
   </feature>
-  <feature name='tsc-deadline'>
-    <cpuid eax_in='0x01' ecx='0x01000000'/>
+  <feature name="tsc-deadline">
+    <cpuid eax_in="0x01" ecx="0x01000000"/>
   </feature>
-  <feature name='aes'>
-    <cpuid eax_in='0x01' ecx='0x02000000'/>
+  <feature name="aes">
+    <cpuid eax_in="0x01" ecx="0x02000000"/>
   </feature>
-  <feature name='xsave'>
-    <cpuid eax_in='0x01' ecx='0x04000000'/>
+  <feature name="xsave">
+    <cpuid eax_in="0x01" ecx="0x04000000"/>
   </feature>
-  <feature name='osxsave'>
-    <cpuid eax_in='0x01' ecx='0x08000000'/>
+  <feature name="osxsave">
+    <cpuid eax_in="0x01" ecx="0x08000000"/>
   </feature>
-  <feature name='avx'>
-    <cpuid eax_in='0x01' ecx='0x10000000'/>
+  <feature name="avx">
+    <cpuid eax_in="0x01" ecx="0x10000000"/>
   </feature>
-  <feature name='f16c'>
-    <cpuid eax_in='0x01' ecx='0x20000000'/>
+  <feature name="f16c">
+    <cpuid eax_in="0x01" ecx="0x20000000"/>
   </feature>
-  <feature name='rdrand'>
-    <cpuid eax_in='0x01' ecx='0x40000000'/>
+  <feature name="rdrand">
+    <cpuid eax_in="0x01" ecx="0x40000000"/>
   </feature>
-  <feature name='hypervisor'>
-    <cpuid eax_in='0x01' ecx='0x80000000'/>
+  <feature name="hypervisor">
+    <cpuid eax_in="0x01" ecx="0x80000000"/>
   </feature>
 
   <!-- Termal Power and Management -->
-  <feature name='arat'>
-    <cpuid eax_in='0x06' eax='0x00000004'/>
+  <feature name="arat">
+    <cpuid eax_in="0x06" eax="0x00000004"/>
   </feature>
 
   <!-- cpuid function 0x7 ecx 0x0 features -->
-  <feature name='fsgsbase'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000001'/>
+  <feature name="fsgsbase">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x00000001"/>
   </feature>
-  <feature name='tsc_adjust'> <!-- tsc-adjust -->
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000002'/>
+  <feature name="tsc_adjust"> <!-- tsc-adjust -->
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x00000002"/>
   </feature>
-  <feature name='bmi1'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000008'/>
+  <feature name="bmi1">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x00000008"/>
   </feature>
-  <feature name='hle'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000010'/>
+  <feature name="hle">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x00000010"/>
   </feature>
-  <feature name='avx2'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000020'/>
+  <feature name="avx2">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x00000020"/>
   </feature>
-  <feature name='smep'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000080'/>
+  <feature name="smep">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x00000080"/>
   </feature>
-  <feature name='bmi2'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000100'/>
+  <feature name="bmi2">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x00000100"/>
   </feature>
-  <feature name='erms'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000200'/>
+  <feature name="erms">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x00000200"/>
   </feature>
-  <feature name='invpcid'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000400'/>
+  <feature name="invpcid">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x00000400"/>
   </feature>
-  <feature name='rtm'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000800'/>
+  <feature name="rtm">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x00000800"/>
   </feature>
-  <feature name='cmt'> <!-- cqm -->
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00001000'/>
+  <feature name="cmt"> <!-- cqm -->
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x00001000"/>
   </feature>
-  <feature name='mpx'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00004000'/>
+  <feature name="mpx">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x00004000"/>
   </feature>
-  <feature name='avx512f'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00010000'/>
+  <feature name="avx512f">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x00010000"/>
   </feature>
-  <feature name='avx512dq'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00020000'/>
+  <feature name="avx512dq">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x00020000"/>
   </feature>
-  <feature name='rdseed'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00040000'/>
+  <feature name="rdseed">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x00040000"/>
   </feature>
-  <feature name='adx'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00080000'/>
+  <feature name="adx">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x00080000"/>
   </feature>
-  <feature name='smap'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00100000'/>
+  <feature name="smap">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x00100000"/>
   </feature>
-  <feature name='avx512ifma'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00200000'/>
+  <feature name="avx512ifma">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x00200000"/>
   </feature>
-  <feature name='pcommit'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00400000'/>
+  <feature name="pcommit">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x00400000"/>
   </feature>
-  <feature name='clflushopt'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00800000'/>
+  <feature name="clflushopt">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x00800000"/>
   </feature>
-  <feature name='clwb'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x01000000'/>
+  <feature name="clwb">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x01000000"/>
   </feature>
-  <feature name='intel-pt'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x02000000'/>
+  <feature name="intel-pt">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x02000000"/>
   </feature>
-  <feature name='avx512pf'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x04000000'/>
+  <feature name="avx512pf">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x04000000"/>
   </feature>
-  <feature name='avx512er'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x08000000'/>
+  <feature name="avx512er">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x08000000"/>
   </feature>
-  <feature name='avx512cd'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x10000000'/>
+  <feature name="avx512cd">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x10000000"/>
   </feature>
-  <feature name='sha-ni'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x20000000'/>
+  <feature name="sha-ni">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x20000000"/>
   </feature>
-  <feature name='avx512bw'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x40000000'/>
+  <feature name="avx512bw">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x40000000"/>
   </feature>
-  <feature name='avx512vl'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x80000000'/>
+  <feature name="avx512vl">
+    <cpuid eax_in="0x07" ecx_in="0x00" ebx="0x80000000"/>
   </feature>
 
-  <feature name='avx512vbmi'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000002'/>
+  <feature name="avx512vbmi">
+    <cpuid eax_in="0x07" ecx_in="0x00" ecx="0x00000002"/>
   </feature>
-  <feature name='umip'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000004'/>
+  <feature name="umip">
+    <cpuid eax_in="0x07" ecx_in="0x00" ecx="0x00000004"/>
   </feature>
-  <feature name='pku'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000008'/>
+  <feature name="pku">
+    <cpuid eax_in="0x07" ecx_in="0x00" ecx="0x00000008"/>
   </feature>
-  <feature name='ospke'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000010'/>
+  <feature name="ospke">
+    <cpuid eax_in="0x07" ecx_in="0x00" ecx="0x00000010"/>
   </feature>
-  <feature name='waitpkg'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000020'/>
+  <feature name="waitpkg">
+    <cpuid eax_in="0x07" ecx_in="0x00" ecx="0x00000020"/>
   </feature>
-  <feature name='avx512vbmi2'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000040'/>
+  <feature name="avx512vbmi2">
+    <cpuid eax_in="0x07" ecx_in="0x00" ecx="0x00000040"/>
   </feature>
-  <feature name='gfni'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000100'/>
+  <feature name="gfni">
+    <cpuid eax_in="0x07" ecx_in="0x00" ecx="0x00000100"/>
   </feature>
-  <feature name='vaes'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000200'/>
+  <feature name="vaes">
+    <cpuid eax_in="0x07" ecx_in="0x00" ecx="0x00000200"/>
   </feature>
-  <feature name='vpclmulqdq'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000400'/>
+  <feature name="vpclmulqdq">
+    <cpuid eax_in="0x07" ecx_in="0x00" ecx="0x00000400"/>
   </feature>
-  <feature name='avx512vnni'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000800'/>
+  <feature name="avx512vnni">
+    <cpuid eax_in="0x07" ecx_in="0x00" ecx="0x00000800"/>
   </feature>
-  <feature name='avx512bitalg'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00001000'/>
+  <feature name="avx512bitalg">
+    <cpuid eax_in="0x07" ecx_in="0x00" ecx="0x00001000"/>
   </feature>
-  <feature name='avx512-vpopcntdq'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00004000'/>
+  <feature name="avx512-vpopcntdq">
+    <cpuid eax_in="0x07" ecx_in="0x00" ecx="0x00004000"/>
   </feature>
-  <feature name='la57'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00010000'/>
+  <feature name="la57">
+    <cpuid eax_in="0x07" ecx_in="0x00" ecx="0x00010000"/>
   </feature>
-  <feature name='rdpid'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00400000'/>
+  <feature name="rdpid">
+    <cpuid eax_in="0x07" ecx_in="0x00" ecx="0x00400000"/>
   </feature>
-  <feature name='cldemote'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x02000000'/>
+  <feature name="cldemote">
+    <cpuid eax_in="0x07" ecx_in="0x00" ecx="0x02000000"/>
   </feature>
-  <feature name='movdiri'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x08000000'/>
+  <feature name="movdiri">
+    <cpuid eax_in="0x07" ecx_in="0x00" ecx="0x08000000"/>
   </feature>
-  <feature name='movdir64b'>
-    <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x10000000'/>
+  <feature name="movdir64b">
+    <cpuid eax_in="0x07" ecx_in="0x00" ecx="0x10000000"/>
   </feature>
 
-  <feature name='avx512-4vnniw'>
-    <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000004'/>
+  <feature name="avx512-4vnniw">
+    <cpuid eax_in="0x07" ecx_in="0x00" edx="0x00000004"/>
   </feature>
-  <feature name='avx512-4fmaps'>
-    <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000008'/>
+  <feature name="avx512-4fmaps">
+    <cpuid eax_in="0x07" ecx_in="0x00" edx="0x00000008"/>
   </feature>
-  <feature name='md-clear'> <!-- md_clear -->
-    <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000400'/>
+  <feature name="md-clear"> <!-- md_clear -->
+    <cpuid eax_in="0x07" ecx_in="0x00" edx="0x00000400"/>
   </feature>
-  <feature name='pconfig'>
-    <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00040000'/>
+  <feature name="pconfig">
+    <cpuid eax_in="0x07" ecx_in="0x00" edx="0x00040000"/>
   </feature>
-  <feature name='spec-ctrl'>
-    <cpuid eax_in='0x07' ecx_in='0x00' edx='0x04000000'/>
+  <feature name="spec-ctrl">
+    <cpuid eax_in="0x07" ecx_in="0x00" edx="0x04000000"/>
   </feature>
-  <feature name='stibp'>
-    <cpuid eax_in='0x07' ecx_in='0x00' edx='0x08000000'/>
+  <feature name="stibp">
+    <cpuid eax_in="0x07" ecx_in="0x00" edx="0x08000000"/>
   </feature>
-  <feature name='arch-capabilities'> <!-- arch_capabilities, arch-facilities -->
-    <cpuid eax_in='0x07' ecx_in='0x00' edx='0x20000000'/>
+  <feature name="arch-capabilities"> <!-- arch_capabilities, arch-facilities -->
+    <cpuid eax_in="0x07" ecx_in="0x00" edx="0x20000000"/>
   </feature>
-  <feature name='ssbd'>
-    <cpuid eax_in='0x07' ecx_in='0x00' edx='0x80000000'/>
+  <feature name="ssbd">
+    <cpuid eax_in="0x07" ecx_in="0x00" edx="0x80000000"/>
   </feature>
 
-  <feature name='avx512-bf16'>
-    <cpuid eax_in='0x07' ecx_in='0x01' eax='0x00000020'/>
+  <feature name="avx512-bf16">
+    <cpuid eax_in="0x07" ecx_in="0x01" eax="0x00000020"/>
   </feature>
 
   <!-- Processor Extended State Enumeration sub leaf 1 -->
-  <feature name='xsaveopt'>
-    <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000001'/>
+  <feature name="xsaveopt">
+    <cpuid eax_in="0x0d" ecx_in="0x01" eax="0x00000001"/>
   </feature>
-  <feature name='xsavec'>
-    <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000002'/>
+  <feature name="xsavec">
+    <cpuid eax_in="0x0d" ecx_in="0x01" eax="0x00000002"/>
   </feature>
-  <feature name='xgetbv1'>
-    <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000004'/>
+  <feature name="xgetbv1">
+    <cpuid eax_in="0x0d" ecx_in="0x01" eax="0x00000004"/>
   </feature>
-  <feature name='xsaves' migratable='no'>
-    <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000008'/>
+  <feature name="xsaves" migratable="no">
+    <cpuid eax_in="0x0d" ecx_in="0x01" eax="0x00000008"/>
   </feature>
 
   <!-- cpuid level 0x0000000f:1 (edx) -->
-  <feature name='mbm_total'>
-    <cpuid eax_in='0x0f' ecx_in='0x01' edx='0x00000002'/>
+  <feature name="mbm_total">
+    <cpuid eax_in="0x0f" ecx_in="0x01" edx="0x00000002"/>
   </feature>
-  <feature name='mbm_local'>
-    <cpuid eax_in='0x0f' ecx_in='0x01' edx='0x00000004'/>
+  <feature name="mbm_local">
+    <cpuid eax_in="0x0f" ecx_in="0x01" edx="0x00000004"/>
   </feature>
 
   <!-- extended features, EDX -->
-  <feature name='syscall'>
-    <cpuid eax_in='0x80000001' edx='0x00000800'/>
+  <feature name="syscall">
+    <cpuid eax_in="0x80000001" edx="0x00000800"/>
   </feature>
-  <feature name='nx'> <!-- xd -->
-    <cpuid eax_in='0x80000001' edx='0x00100000'/>
+  <feature name="nx"> <!-- xd -->
+    <cpuid eax_in="0x80000001" edx="0x00100000"/>
   </feature>
-  <feature name='mmxext'>
-    <cpuid eax_in='0x80000001' edx='0x00400000'/>
+  <feature name="mmxext">
+    <cpuid eax_in="0x80000001" edx="0x00400000"/>
   </feature>
-  <feature name='fxsr_opt'> <!-- ffxsr, fxsr-opt -->
-    <cpuid eax_in='0x80000001' edx='0x02000000'/>
+  <feature name="fxsr_opt"> <!-- ffxsr, fxsr-opt -->
+    <cpuid eax_in="0x80000001" edx="0x02000000"/>
   </feature>
-  <feature name='pdpe1gb'>
-    <cpuid eax_in='0x80000001' edx='0x04000000'/>
+  <feature name="pdpe1gb">
+    <cpuid eax_in="0x80000001" edx="0x04000000"/>
   </feature>
-  <feature name='rdtscp'>
-    <cpuid eax_in='0x80000001' edx='0x08000000'/>
+  <feature name="rdtscp">
+    <cpuid eax_in="0x80000001" edx="0x08000000"/>
   </feature>
-  <feature name='lm'> <!-- i64 -->
-    <cpuid eax_in='0x80000001' edx='0x20000000'/>
+  <feature name="lm"> <!-- i64 -->
+    <cpuid eax_in="0x80000001" edx="0x20000000"/>
   </feature>
-  <feature name='3dnowext'>
-    <cpuid eax_in='0x80000001' edx='0x40000000'/>
+  <feature name="3dnowext">
+    <cpuid eax_in="0x80000001" edx="0x40000000"/>
   </feature>
-  <feature name='3dnow'>
-    <cpuid eax_in='0x80000001' edx='0x80000000'/>
+  <feature name="3dnow">
+    <cpuid eax_in="0x80000001" edx="0x80000000"/>
   </feature>
 
   <!-- extended features, ECX -->
-  <feature name='lahf_lm'> <!-- lahf-lm -->
-    <cpuid eax_in='0x80000001' ecx='0x00000001'/>
+  <feature name="lahf_lm"> <!-- lahf-lm -->
+    <cpuid eax_in="0x80000001" ecx="0x00000001"/>
   </feature>
-  <feature name='cmp_legacy'> <!-- cmp-legacy -->
-    <cpuid eax_in='0x80000001' ecx='0x00000002'/>
+  <feature name="cmp_legacy"> <!-- cmp-legacy -->
+    <cpuid eax_in="0x80000001" ecx="0x00000002"/>
   </feature>
-  <feature name='svm'>
-    <cpuid eax_in='0x80000001' ecx='0x00000004'/>
+  <feature name="svm">
+    <cpuid eax_in="0x80000001" ecx="0x00000004"/>
   </feature>
-  <feature name='extapic'>
-    <cpuid eax_in='0x80000001' ecx='0x00000008'/>
+  <feature name="extapic">
+    <cpuid eax_in="0x80000001" ecx="0x00000008"/>
   </feature>
-  <feature name='cr8legacy'>
-    <cpuid eax_in='0x80000001' ecx='0x00000010'/>
+  <feature name="cr8legacy">
+    <cpuid eax_in="0x80000001" ecx="0x00000010"/>
   </feature>
-  <feature name='abm'>
-    <cpuid eax_in='0x80000001' ecx='0x00000020'/>
+  <feature name="abm">
+    <cpuid eax_in="0x80000001" ecx="0x00000020"/>
   </feature>
-  <feature name='sse4a'>
-    <cpuid eax_in='0x80000001' ecx='0x00000040'/>
+  <feature name="sse4a">
+    <cpuid eax_in="0x80000001" ecx="0x00000040"/>
   </feature>
-  <feature name='misalignsse'>
-    <cpuid eax_in='0x80000001' ecx='0x00000080'/>
+  <feature name="misalignsse">
+    <cpuid eax_in="0x80000001" ecx="0x00000080"/>
   </feature>
-  <feature name='3dnowprefetch'>
-    <cpuid eax_in='0x80000001' ecx='0x00000100'/>
+  <feature name="3dnowprefetch">
+    <cpuid eax_in="0x80000001" ecx="0x00000100"/>
   </feature>
-  <feature name='osvw'>
-    <cpuid eax_in='0x80000001' ecx='0x00000200'/>
+  <feature name="osvw">
+    <cpuid eax_in="0x80000001" ecx="0x00000200"/>
   </feature>
-  <feature name='ibs'>
-    <cpuid eax_in='0x80000001' ecx='0x00000400'/>
+  <feature name="ibs">
+    <cpuid eax_in="0x80000001" ecx="0x00000400"/>
   </feature>
-  <feature name='xop'>
-    <cpuid eax_in='0x80000001' ecx='0x00000800'/>
+  <feature name="xop">
+    <cpuid eax_in="0x80000001" ecx="0x00000800"/>
   </feature>
-  <feature name='skinit'>
-    <cpuid eax_in='0x80000001' ecx='0x00001000'/>
+  <feature name="skinit">
+    <cpuid eax_in="0x80000001" ecx="0x00001000"/>
   </feature>
-  <feature name='wdt'>
-    <cpuid eax_in='0x80000001' ecx='0x00002000'/>
+  <feature name="wdt">
+    <cpuid eax_in="0x80000001" ecx="0x00002000"/>
   </feature>
-  <feature name='lwp'>
-    <cpuid eax_in='0x80000001' ecx='0x00008000'/>
+  <feature name="lwp">
+    <cpuid eax_in="0x80000001" ecx="0x00008000"/>
   </feature>
-  <feature name='fma4'>
-    <cpuid eax_in='0x80000001' ecx='0x00010000'/>
+  <feature name="fma4">
+    <cpuid eax_in="0x80000001" ecx="0x00010000"/>
   </feature>
-  <feature name='tce'>
-    <cpuid eax_in='0x80000001' ecx='0x00020000'/>
+  <feature name="tce">
+    <cpuid eax_in="0x80000001" ecx="0x00020000"/>
   </feature>
-  <feature name='cvt16'>
-    <cpuid eax_in='0x80000001' ecx='0x00040000'/>
+  <feature name="cvt16">
+    <cpuid eax_in="0x80000001" ecx="0x00040000"/>
   </feature>
-  <feature name='nodeid_msr'> <!-- nodeid-msr -->
-    <cpuid eax_in='0x80000001' ecx='0x00080000'/>
+  <feature name="nodeid_msr"> <!-- nodeid-msr -->
+    <cpuid eax_in="0x80000001" ecx="0x00080000"/>
   </feature>
-  <feature name='tbm'>
-    <cpuid eax_in='0x80000001' ecx='0x00200000'/>
+  <feature name="tbm">
+    <cpuid eax_in="0x80000001" ecx="0x00200000"/>
   </feature>
-  <feature name='topoext'>
-    <cpuid eax_in='0x80000001' ecx='0x00400000'/>
+  <feature name="topoext">
+    <cpuid eax_in="0x80000001" ecx="0x00400000"/>
   </feature>
-  <feature name='perfctr_core'> <!-- perfctr-core -->
-    <cpuid eax_in='0x80000001' ecx='0x00800000'/>
+  <feature name="perfctr_core"> <!-- perfctr-core -->
+    <cpuid eax_in="0x80000001" ecx="0x00800000"/>
   </feature>
-  <feature name='perfctr_nb'> <!-- perfctr-nb -->
-    <cpuid eax_in='0x80000001' ecx='0x01000000'/>
+  <feature name="perfctr_nb"> <!-- perfctr-nb -->
+    <cpuid eax_in="0x80000001" ecx="0x01000000"/>
   </feature>
 
   <!-- Advanced Power Management edx features -->
-  <feature name='invtsc' migratable='no'>
-    <cpuid eax_in='0x80000007' edx='0x00000100'/>
+  <feature name="invtsc" migratable="no">
+    <cpuid eax_in="0x80000007" edx="0x00000100"/>
   </feature>
 
   <!-- More AMD-specific features -->
-  <feature name='clzero'>
-    <cpuid eax_in='0x80000008' ebx='0x00000001'/>
+  <feature name="clzero">
+    <cpuid eax_in="0x80000008" ebx="0x00000001"/>
   </feature>
-  <feature name='xsaveerptr'>
-    <cpuid eax_in='0x80000008' ebx='0x00000004'/>
+  <feature name="xsaveerptr">
+    <cpuid eax_in="0x80000008" ebx="0x00000004"/>
   </feature>
-  <feature name='wbnoinvd'>
-    <cpuid eax_in='0x80000008' ebx='0x00000200'/>
+  <feature name="wbnoinvd">
+    <cpuid eax_in="0x80000008" ebx="0x00000200"/>
   </feature>
-  <feature name='ibpb'>
-    <cpuid eax_in='0x80000008' ebx='0x00001000'/>
+  <feature name="ibpb">
+    <cpuid eax_in="0x80000008" ebx="0x00001000"/>
   </feature>
-  <feature name='amd-stibp'>
-    <cpuid eax_in='0x80000008' ebx='0x00008000'/>
+  <feature name="amd-stibp">
+    <cpuid eax_in="0x80000008" ebx="0x00008000"/>
   </feature>
-  <feature name='amd-ssbd'>
-    <cpuid eax_in='0x80000008' ebx='0x01000000'/>
+  <feature name="amd-ssbd">
+    <cpuid eax_in="0x80000008" ebx="0x01000000"/>
   </feature>
-  <feature name='virt-ssbd'>
-    <cpuid eax_in='0x80000008' ebx='0x02000000'/>
+  <feature name="virt-ssbd">
+    <cpuid eax_in="0x80000008" ebx="0x02000000"/>
   </feature>
-  <feature name='amd-no-ssb'>
-    <cpuid eax_in='0x80000008' ebx='0x04000000'/>
+  <feature name="amd-no-ssb">
+    <cpuid eax_in="0x80000008" ebx="0x04000000"/>
   </feature>
 
   <!-- SVM features -->
-  <feature name='npt'>
-    <cpuid eax_in='0x8000000a' edx='0x00000001'/>
+  <feature name="npt">
+    <cpuid eax_in="0x8000000a" edx="0x00000001"/>
   </feature>
-  <feature name='lbrv'>
-    <cpuid eax_in='0x8000000a' edx='0x00000002'/>
+  <feature name="lbrv">
+    <cpuid eax_in="0x8000000a" edx="0x00000002"/>
   </feature>
-  <feature name='svm-lock'>
-    <cpuid eax_in='0x8000000a' edx='0x00000004'/>
+  <feature name="svm-lock">
+    <cpuid eax_in="0x8000000a" edx="0x00000004"/>
   </feature>
-  <feature name='nrip-save'>
-    <cpuid eax_in='0x8000000a' edx='0x00000008'/>
+  <feature name="nrip-save">
+    <cpuid eax_in="0x8000000a" edx="0x00000008"/>
   </feature>
-  <feature name='tsc-scale'>
-    <cpuid eax_in='0x8000000a' edx='0x00000010'/>
+  <feature name="tsc-scale">
+    <cpuid eax_in="0x8000000a" edx="0x00000010"/>
   </feature>
-  <feature name='vmcb-clean'>
-    <cpuid eax_in='0x8000000a' edx='0x00000020'/>
+  <feature name="vmcb-clean">
+    <cpuid eax_in="0x8000000a" edx="0x00000020"/>
   </feature>
-  <feature name='flushbyasid'>
-    <cpuid eax_in='0x8000000a' edx='0x00000040'/>
+  <feature name="flushbyasid">
+    <cpuid eax_in="0x8000000a" edx="0x00000040"/>
   </feature>
-  <feature name='decodeassists'>
-    <cpuid eax_in='0x8000000a' edx='0x00000080'/>
+  <feature name="decodeassists">
+    <cpuid eax_in="0x8000000a" edx="0x00000080"/>
   </feature>
-  <feature name='pause-filter'>
-    <cpuid eax_in='0x8000000a' edx='0x00000400'/>
+  <feature name="pause-filter">
+    <cpuid eax_in="0x8000000a" edx="0x00000400"/>
   </feature>
-  <feature name='pfthreshold'>
-    <cpuid eax_in='0x8000000a' edx='0x00001000'/>
+  <feature name="pfthreshold">
+    <cpuid eax_in="0x8000000a" edx="0x00001000"/>
   </feature>
 
   <!-- IA32_ARCH_CAPABILITIES features -->
-  <feature name='rdctl-no'>
-    <msr index='0x10a' edx='0x00000000' eax='0x00000001'/>
+  <feature name="rdctl-no">
+    <msr index="0x10a" edx="0x00000000" eax="0x00000001"/>
   </feature>
-  <feature name='ibrs-all'>
-    <msr index='0x10a' edx='0x00000000' eax='0x00000002'/>
+  <feature name="ibrs-all">
+    <msr index="0x10a" edx="0x00000000" eax="0x00000002"/>
   </feature>
-  <feature name='rsba'>
-    <msr index='0x10a' edx='0x00000000' eax='0x00000004'/>
+  <feature name="rsba">
+    <msr index="0x10a" edx="0x00000000" eax="0x00000004"/>
   </feature>
-  <feature name='skip-l1dfl-vmentry'>
-    <msr index='0x10a' edx='0x00000000' eax='0x00000008'/>
+  <feature name="skip-l1dfl-vmentry">
+    <msr index="0x10a" edx="0x00000000" eax="0x00000008"/>
   </feature>
-  <feature name='ssb-no'>
-    <msr index='0x10a' edx='0x00000000' eax='0x00000010'/>
+  <feature name="ssb-no">
+    <msr index="0x10a" edx="0x00000000" eax="0x00000010"/>
   </feature>
-  <feature name='mds-no'>
-    <msr index='0x10a' edx='0x00000000' eax='0x00000020'/>
+  <feature name="mds-no">
+    <msr index="0x10a" edx="0x00000000" eax="0x00000020"/>
   </feature>
-  <feature name='pschange-mc-no'>
-    <msr index='0x10a' edx='0x00000000' eax='0x00000040'/>
+  <feature name="pschange-mc-no">
+    <msr index="0x10a" edx="0x00000000" eax="0x00000040"/>
   </feature>
-  <feature name='tsx-ctrl'>
-    <msr index='0x10a' edx='0x00000000' eax='0x00000080'/>
+  <feature name="tsx-ctrl">
+    <msr index="0x10a" edx="0x00000000" eax="0x00000080"/>
   </feature>
-  <feature name='taa-no'>
-    <msr index='0x10a' edx='0x00000000' eax='0x00000100'/>
+  <feature name="taa-no">
+    <msr index="0x10a" edx="0x00000000" eax="0x00000100"/>
   </feature>
 </cpus>
diff --git a/src/cpu_map/x86_kvm32.xml b/src/cpu_map/x86_kvm32.xml
index 9dd96d5b56..c35985f274 100644
--- a/src/cpu_map/x86_kvm32.xml
+++ b/src/cpu_map/x86_kvm32.xml
@@ -1,27 +1,27 @@
 <cpus>
-  <model name='kvm32'>
-    <decode host='on' guest='on'/>
-    <feature name='apic'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='sep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='tsc'/>
+  <model name="kvm32">
+    <decode host="on" guest="on"/>
+    <feature name="apic"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="sep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="tsc"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_kvm64.xml b/src/cpu_map/x86_kvm64.xml
index 185af06f78..dafdd7c979 100644
--- a/src/cpu_map/x86_kvm64.xml
+++ b/src/cpu_map/x86_kvm64.xml
@@ -1,31 +1,31 @@
 <cpus>
-  <model name='kvm64'>
-    <decode host='on' guest='on'/>
-    <feature name='apic'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='sep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
+  <model name="kvm64">
+    <decode host="on" guest="on"/>
+    <feature name="apic"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="sep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_n270.xml b/src/cpu_map/x86_n270.xml
index 5507d2ea3b..0fc392cbe9 100644
--- a/src/cpu_map/x86_n270.xml
+++ b/src/cpu_map/x86_n270.xml
@@ -1,31 +1,31 @@
 <cpus>
-  <model name='n270'>
-    <decode host='on' guest='on'/>
-    <vendor name='Intel'/>
-    <feature name='apic'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='monitor'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='pse'/>
-    <feature name='sep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='ssse3'/>
-    <feature name='tsc'/>
-    <feature name='vme'/>
+  <model name="n270">
+    <decode host="on" guest="on"/>
+    <vendor name="Intel"/>
+    <feature name="apic"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="monitor"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="pse"/>
+    <feature name="sep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="ssse3"/>
+    <feature name="tsc"/>
+    <feature name="vme"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_pentium.xml b/src/cpu_map/x86_pentium.xml
index f0a8982115..9863e495eb 100644
--- a/src/cpu_map/x86_pentium.xml
+++ b/src/cpu_map/x86_pentium.xml
@@ -1,14 +1,14 @@
 <cpus>
-  <model name='pentium'>
-    <decode host='on' guest='on'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='pse'/>
-    <feature name='tsc'/>
-    <feature name='vme'/>
+  <model name="pentium">
+    <decode host="on" guest="on"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="pse"/>
+    <feature name="tsc"/>
+    <feature name="vme"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_pentium2.xml b/src/cpu_map/x86_pentium2.xml
index aeba082297..a8fc0fea78 100644
--- a/src/cpu_map/x86_pentium2.xml
+++ b/src/cpu_map/x86_pentium2.xml
@@ -1,23 +1,23 @@
 <cpus>
-  <model name='pentium2'>
-    <decode host='on' guest='on'/>
-    <feature name='cmov'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pge'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='sep'/>
-    <feature name='tsc'/>
-    <feature name='vme'/>
+  <model name="pentium2">
+    <decode host="on" guest="on"/>
+    <feature name="cmov"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pge"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="sep"/>
+    <feature name="tsc"/>
+    <feature name="vme"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_pentium3.xml b/src/cpu_map/x86_pentium3.xml
index ab85d2967f..7a75b1c517 100644
--- a/src/cpu_map/x86_pentium3.xml
+++ b/src/cpu_map/x86_pentium3.xml
@@ -1,24 +1,24 @@
 <cpus>
-  <model name='pentium3'>
-    <decode host='on' guest='on'/>
-    <feature name='cmov'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pge'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='sep'/>
-    <feature name='sse'/>
-    <feature name='tsc'/>
-    <feature name='vme'/>
+  <model name="pentium3">
+    <decode host="on" guest="on"/>
+    <feature name="cmov"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pge"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="sep"/>
+    <feature name="sse"/>
+    <feature name="tsc"/>
+    <feature name="vme"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_pentiumpro.xml b/src/cpu_map/x86_pentiumpro.xml
index b6e061187c..725c0f33b4 100644
--- a/src/cpu_map/x86_pentiumpro.xml
+++ b/src/cpu_map/x86_pentiumpro.xml
@@ -1,22 +1,22 @@
 <cpus>
-  <model name='pentiumpro'>
-    <decode host='on' guest='on'/>
-    <feature name='apic'/>
-    <feature name='cmov'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pge'/>
-    <feature name='pse'/>
-    <feature name='sep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='tsc'/>
+  <model name="pentiumpro">
+    <decode host="on" guest="on"/>
+    <feature name="apic"/>
+    <feature name="cmov"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pge"/>
+    <feature name="pse"/>
+    <feature name="sep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="tsc"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_phenom.xml b/src/cpu_map/x86_phenom.xml
index f0f8ece57a..76bd20b594 100644
--- a/src/cpu_map/x86_phenom.xml
+++ b/src/cpu_map/x86_phenom.xml
@@ -1,37 +1,37 @@
 <cpus>
-  <model name='phenom'>
-    <decode host='on' guest='on'/>
-    <vendor name='AMD'/>
-    <feature name='3dnow'/>
-    <feature name='3dnowext'/>
-    <feature name='apic'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='fxsr_opt'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='mmxext'/>
-    <feature name='monitor'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='sep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='svm'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
+  <model name="phenom">
+    <decode host="on" guest="on"/>
+    <vendor name="AMD"/>
+    <feature name="3dnow"/>
+    <feature name="3dnowext"/>
+    <feature name="apic"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="fxsr_opt"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="mmxext"/>
+    <feature name="monitor"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="sep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="svm"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_qemu32.xml b/src/cpu_map/x86_qemu32.xml
index f3fb1959be..2a126384a6 100644
--- a/src/cpu_map/x86_qemu32.xml
+++ b/src/cpu_map/x86_qemu32.xml
@@ -1,23 +1,23 @@
 <cpus>
-  <model name='qemu32'>
-    <decode host='on' guest='on'/>
-    <feature name='apic'/>
-    <feature name='cmov'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='pse'/>
-    <feature name='sep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='tsc'/>
+  <model name="qemu32">
+    <decode host="on" guest="on"/>
+    <feature name="apic"/>
+    <feature name="cmov"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="pse"/>
+    <feature name="sep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="tsc"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_qemu64.xml b/src/cpu_map/x86_qemu64.xml
index 0fe207a2b4..61b1ea5a71 100644
--- a/src/cpu_map/x86_qemu64.xml
+++ b/src/cpu_map/x86_qemu64.xml
@@ -1,40 +1,40 @@
 <cpus>
-  <model name='qemu64'>
-    <decode host='on' guest='on'/>
+  <model name="qemu64">
+    <decode host="on" guest="on"/>
     <!-- These are supported only by TCG.  KVM supports them only if the
          host does.  So we leave them out:
 
-    <feature name='abm'/>
-    <feature name='lahf_lm'/>
-    <feature name='popcnt'/>
-    <feature name='sse4a'/>
+    <feature name="abm"/>
+    <feature name="lahf_lm"/>
+    <feature name="popcnt"/>
+    <feature name="sse4a"/>
     -->
-    <feature name='apic'/>
-    <feature name='clflush'/>
-    <feature name='cmov'/>
-    <feature name='cx16'/>
-    <feature name='cx8'/>
-    <feature name='de'/>
-    <feature name='fpu'/>
-    <feature name='fxsr'/>
-    <feature name='lm'/>
-    <feature name='mca'/>
-    <feature name='mce'/>
-    <feature name='mmx'/>
-    <feature name='msr'/>
-    <feature name='mtrr'/>
-    <feature name='nx'/>
-    <feature name='pae'/>
-    <feature name='pat'/>
-    <feature name='pge'/>
-    <feature name='pni'/>
-    <feature name='pse'/>
-    <feature name='pse36'/>
-    <feature name='sep'/>
-    <feature name='sse'/>
-    <feature name='sse2'/>
-    <feature name='svm'/>
-    <feature name='syscall'/>
-    <feature name='tsc'/>
+    <feature name="apic"/>
+    <feature name="clflush"/>
+    <feature name="cmov"/>
+    <feature name="cx16"/>
+    <feature name="cx8"/>
+    <feature name="de"/>
+    <feature name="fpu"/>
+    <feature name="fxsr"/>
+    <feature name="lm"/>
+    <feature name="mca"/>
+    <feature name="mce"/>
+    <feature name="mmx"/>
+    <feature name="msr"/>
+    <feature name="mtrr"/>
+    <feature name="nx"/>
+    <feature name="pae"/>
+    <feature name="pat"/>
+    <feature name="pge"/>
+    <feature name="pni"/>
+    <feature name="pse"/>
+    <feature name="pse36"/>
+    <feature name="sep"/>
+    <feature name="sse"/>
+    <feature name="sse2"/>
+    <feature name="svm"/>
+    <feature name="syscall"/>
+    <feature name="tsc"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_vendors.xml b/src/cpu_map/x86_vendors.xml
index 840179d1f8..6c746f35c9 100644
--- a/src/cpu_map/x86_vendors.xml
+++ b/src/cpu_map/x86_vendors.xml
@@ -1,5 +1,5 @@
 <cpus>
-  <vendor name='Intel' string='GenuineIntel'/>
-  <vendor name='AMD' string='AuthenticAMD'/>
-  <vendor name='Hygon' string='HygonGenuine'/>
+  <vendor name="Intel" string="GenuineIntel"/>
+  <vendor name="AMD" string="AuthenticAMD"/>
+  <vendor name="Hygon" string="HygonGenuine"/>
 </cpus>
-- 
2.26.2