cpu_map: Fix SierraForest CPU model

The model was defined with two CPU features that cannot be explicitly
configured in QEMU (it knows the MSR bits, but there's no name
associated with them). The features should have never existed in the CPU
map. While removing them from the list of features and existing CPU
models is not trivial (to avoid compatibility issues), we can at least
fix the SierraForest CPU model added in this release cycle.

The rest will be handled later in a separate series.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/cpu_map/x86_SierraForest.xml b/src/cpu_map/x86_SierraForest.xml
index 3fc3049be1d3570f0addee589a514471dacf927e..caa6956e94d603e6badbd955ee510b2af8873798 100644 (file)
--- a/src/cpu_map/x86_SierraForest.xml
+++ b/src/cpu_map/x86_SierraForest.xml
@@ -108,7 +108,6 @@
     <feature name='vmx-ept-1gb'/>
     <feature name='vmx-ept-2mb'/>
     <feature name='vmx-ept-execonly'/>
-    <feature name='vmx-ept-wb'/>
     <feature name='vmx-eptad'/>
     <feature name='vmx-eptp-switching'/>
     <feature name='vmx-exit-ack-intr'/>
@@ -131,7 +130,6 @@
     <feature name='vmx-invvpid'/>
     <feature name='vmx-invvpid-all-context'/>
     <feature name='vmx-invvpid-single-addr'/>
-    <feature name='vmx-invvpid-single-context'/>
     <feature name='vmx-invvpid-single-context-noglobals'/>
     <feature name='vmx-io-bitmap'/>
     <feature name='vmx-io-exit'/>