From 78d177df67c8f7652a8569f9274a365b701d7ec6 Mon Sep 17 00:00:00 2001
From: Jiri Denemark <jdenemar@redhat.com>
Date: Wed, 13 Sep 2017 13:27:10 +0200
Subject: [PATCH] cpu: Add clwb/pcommit CPU features

The features were added to QEMU by commit v2.4.0-1690-gf7fda28094 as
Skylake Server features.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
---
 src/cpu/cpu_map.xml                                     | 6 ++++++
 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml  | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml  | 1 +
 tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml    | 2 ++
 5 files changed, 11 insertions(+)

diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
index 6243fbe902..c1aee0abc9 100644
--- a/src/cpu/cpu_map.xml
+++ b/src/cpu/cpu_map.xml
@@ -248,9 +248,15 @@
     <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>
     <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>
     <feature name='avx512pf'>
       <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x04000000'/>
     </feature>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
index 705caf6030..874f77105d 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
@@ -23,6 +23,7 @@
   <feature policy='require' name='avx512f'/>
   <feature policy='require' name='avx512dq'/>
   <feature policy='require' name='clflushopt'/>
+  <feature policy='require' name='clwb'/>
   <feature policy='require' name='avx512cd'/>
   <feature policy='require' name='avx512bw'/>
   <feature policy='require' name='avx512vl'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
index 114b03e0e1..0d14e88891 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
@@ -24,6 +24,7 @@
   <feature name='avx512f'/>
   <feature name='avx512dq'/>
   <feature name='clflushopt'/>
+  <feature name='clwb'/>
   <feature name='avx512cd'/>
   <feature name='avx512bw'/>
   <feature name='avx512vl'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml
index c5ff67af96..f10a7dec20 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml
@@ -7,6 +7,7 @@
   <feature policy='require' name='avx512f'/>
   <feature policy='require' name='avx512dq'/>
   <feature policy='require' name='clflushopt'/>
+  <feature policy='require' name='clwb'/>
   <feature policy='require' name='avx512cd'/>
   <feature policy='require' name='avx512bw'/>
   <feature policy='require' name='avx512vl'/>
diff --git a/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml b/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml
index af606493aa..7ff998907d 100644
--- a/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml
@@ -38,7 +38,9 @@
       <feature policy='require' name='mpx'/>
       <feature policy='require' name='adx'/>
       <feature policy='require' name='smap'/>
+      <feature policy='require' name='pcommit'/>
       <feature policy='require' name='clflushopt'/>
+      <feature policy='require' name='clwb'/>
       <feature policy='require' name='pku'/>
       <feature policy='require' name='ospke'/>
       <feature policy='require' name='xsaveopt'/>