Although QEMU knows and enables the corresponding MSR bits, it does not
allow users to configure them (there are no names attached to them).
They should have never been added to the CPU map and definitely not to
CPU models as the features will always be considered disabled regardless
on their actual state as QEMU will not report them.
While we cannot drop them completely for backward compatibility, we can
at least remove them from all CPU models.
This is effectively no change for CPU models where the features were
marked with added='yes' because migration source would always remove the
features from domain XML so not adding them to the live XML does not
hurt. On the other side the destination could not ever be surprised by
the features being suddenly enabled as QEMU never reports them, which
means libvirt considers them disabled all the time.
GraniteRapids CPU model is the only one which contains the feature ever
since it was introduced in libvirt, but it was never possible to migrate
a domain with such CPU. The source would always mark vmx-ept-wb as
disabled and the destination without the fixes in this series would drop
the feature from the XML completely as it is unsupported by QEMU and
disabled, but when probing for the actual CPU created by QEMU libvirt
would expect the feature to be enabled (as it is included in the CPU
model and not explicitly mentioned in the domain definition) and fail
the migration. There's nothing the source could do to workaround the
behavior on the destination and migration to older libvirt will still be
broken. But it's possible to migrate a domain with GraniteRapids to a
destination with this series applied from both old and new source.
Signed-off-by: Jiri Denemark <jdenemar@xxxxxxxxxx>
---
src/cpu_map/sync_qemu_features_i386.py | 2 --
src/cpu_map/sync_qemu_models_i386.py | 3 +--
src/cpu_map/x86_Broadwell-IBRS.xml | 1 -
src/cpu_map/x86_Broadwell-noTSX-IBRS.xml | 1 -
src/cpu_map/x86_Broadwell-noTSX.xml | 1 -
src/cpu_map/x86_Broadwell.xml | 1 -
src/cpu_map/x86_Cascadelake-Server-noTSX.xml | 1 -
src/cpu_map/x86_Cascadelake-Server.xml | 1 -
src/cpu_map/x86_Cooperlake.xml | 1 -
src/cpu_map/x86_GraniteRapids.xml | 1 -
src/cpu_map/x86_Haswell-IBRS.xml | 1 -
src/cpu_map/x86_Haswell-noTSX-IBRS.xml | 1 -
src/cpu_map/x86_Haswell-noTSX.xml | 1 -
src/cpu_map/x86_Haswell.xml | 1 -
src/cpu_map/x86_Icelake-Server-noTSX.xml | 1 -
src/cpu_map/x86_Icelake-Server.xml | 1 -
src/cpu_map/x86_IvyBridge-IBRS.xml | 1 -
src/cpu_map/x86_IvyBridge.xml | 1 -
src/cpu_map/x86_Nehalem-IBRS.xml | 1 -
src/cpu_map/x86_Nehalem.xml | 1 -
src/cpu_map/x86_SandyBridge-IBRS.xml | 1 -
src/cpu_map/x86_SandyBridge.xml | 1 -
src/cpu_map/x86_SapphireRapids.xml | 1 -
src/cpu_map/x86_Skylake-Client-IBRS.xml | 1 -
src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml | 1 -
src/cpu_map/x86_Skylake-Client.xml | 1 -
src/cpu_map/x86_Skylake-Server-IBRS.xml | 1 -
src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml | 1 -
src/cpu_map/x86_Skylake-Server.xml | 1 -
src/cpu_map/x86_Snowridge.xml | 1 -
src/cpu_map/x86_Westmere-IBRS.xml | 1 -
src/cpu_map/x86_Westmere.xml | 1 -
src/qemu/qemu_capabilities.c | 1 +
33 files changed, 2 insertions(+), 34 deletions(-)
diff --git a/src/cpu_map/sync_qemu_features_i386.py b/src/cpu_map/sync_qemu_features_i386.py
index 21df37e9d6..c78c0b2ac9 100755
--- a/src/cpu_map/sync_qemu_features_i386.py
+++ b/src/cpu_map/sync_qemu_features_i386.py
@@ -70,8 +70,6 @@ FEATURES_EXTRA = {
18: "cvt16",
},
(0x0000048c,): {
- 8: "vmx-ept-uc",
- 14: "vmx-ept-wb",
41: "vmx-invvpid-single-context", # wrong name in qemu
43: "vmx-invvpid-single-context-noglobals", # wrong name in qemu
}
diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_models_i386.py
index 06a8837b0a..408e07911e 100755
--- a/src/cpu_map/sync_qemu_models_i386.py
+++ b/src/cpu_map/sync_qemu_models_i386.py
@@ -278,8 +278,6 @@ def translate_feature(name):
"MSR_VMX_EPT_EXECONLY": "vmx-ept-execonly",
"MSR_VMX_EPT_PAGE_WALK_LENGTH_4": "vmx-page-walk-4",
"MSR_VMX_EPT_PAGE_WALK_LENGTH_5": "vmx-page-walk-5",
- "MSR_VMX_EPT_UC": "vmx-ept-uc",
- "MSR_VMX_EPT_WB": "vmx-ept-wb",
"MSR_VMX_EPT_2MB": "vmx-ept-2mb",
"MSR_VMX_EPT_1GB": "vmx-ept-1gb",
"MSR_VMX_EPT_INVEPT": "vmx-invept",
@@ -307,6 +305,7 @@ def translate_feature(name):
name in ("CPUID_EXT_MONITOR", "monitor"),
name in ("MSR_VMX_BASIC_DUAL_MONITOR", "dual-monitor"),
name in ("CPUID_EXT3_TOPOEXT", "topoext"),
+ name in ("MSR_VMX_EPT_UC", "MSR_VMX_EPT_WB"),
])
if ignore:
diff --git a/src/cpu_map/x86_Broadwell-IBRS.xml b/src/cpu_map/x86_Broadwell-IBRS.xml
index 1484903298..e87f54a102 100644
--- a/src/cpu_map/x86_Broadwell-IBRS.xml
+++ b/src/cpu_map/x86_Broadwell-IBRS.xml
@@ -78,7 +78,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-eptad' added='yes'/>
<feature name='vmx-eptp-switching' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
diff --git a/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml b/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
index 13f08435b7..59c2c08937 100644
--- a/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
@@ -76,7 +76,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-eptad' added='yes'/>
<feature name='vmx-eptp-switching' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
diff --git a/src/cpu_map/x86_Broadwell-noTSX.xml b/src/cpu_map/x86_Broadwell-noTSX.xml
index 4293b3aeee..b9b25d6b6c 100644
--- a/src/cpu_map/x86_Broadwell-noTSX.xml
+++ b/src/cpu_map/x86_Broadwell-noTSX.xml
@@ -75,7 +75,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-eptad' added='yes'/>
<feature name='vmx-eptp-switching' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
diff --git a/src/cpu_map/x86_Broadwell.xml b/src/cpu_map/x86_Broadwell.xml
index 37dd1dabcf..2845a620ac 100644
--- a/src/cpu_map/x86_Broadwell.xml
+++ b/src/cpu_map/x86_Broadwell.xml
@@ -77,7 +77,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-eptad' added='yes'/>
<feature name='vmx-eptp-switching' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
diff --git a/src/cpu_map/x86_Cascadelake-Server-noTSX.xml b/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
index 8c4cbf9c9a..a3b332c9c1 100644
--- a/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
+++ b/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
@@ -89,7 +89,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-eptad' added='yes'/>
<feature name='vmx-eptp-switching' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
diff --git a/src/cpu_map/x86_Cascadelake-Server.xml b/src/cpu_map/x86_Cascadelake-Server.xml
index c7c4f6412f..9faad320e6 100644
--- a/src/cpu_map/x86_Cascadelake-Server.xml
+++ b/src/cpu_map/x86_Cascadelake-Server.xml
@@ -91,7 +91,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-eptad' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
<feature name='vmx-exit-load-efer' added='yes'/>
diff --git a/src/cpu_map/x86_Cooperlake.xml b/src/cpu_map/x86_Cooperlake.xml
index af428f2781..caccfc048c 100644
--- a/src/cpu_map/x86_Cooperlake.xml
+++ b/src/cpu_map/x86_Cooperlake.xml
@@ -100,7 +100,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-eptad' added='yes'/>
<feature name='vmx-eptp-switching' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
diff --git a/src/cpu_map/x86_GraniteRapids.xml b/src/cpu_map/x86_GraniteRapids.xml
index 6f7030ce39..6dab7d7b09 100644
--- a/src/cpu_map/x86_GraniteRapids.xml
+++ b/src/cpu_map/x86_GraniteRapids.xml
@@ -129,7 +129,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'/>
diff --git a/src/cpu_map/x86_Haswell-IBRS.xml b/src/cpu_map/x86_Haswell-IBRS.xml
index 57b980d14f..e2e3ce6b51 100644
--- a/src/cpu_map/x86_Haswell-IBRS.xml
+++ b/src/cpu_map/x86_Haswell-IBRS.xml
@@ -74,7 +74,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-eptad' added='yes'/>
<feature name='vmx-eptp-switching' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
diff --git a/src/cpu_map/x86_Haswell-noTSX-IBRS.xml b/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
index fcae023ffb..c8d050b8d3 100644
--- a/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
@@ -72,7 +72,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-eptad' added='yes'/>
<feature name='vmx-eptp-switching' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
diff --git a/src/cpu_map/x86_Haswell-noTSX.xml b/src/cpu_map/x86_Haswell-noTSX.xml
index 7404052065..d714ce5858 100644
--- a/src/cpu_map/x86_Haswell-noTSX.xml
+++ b/src/cpu_map/x86_Haswell-noTSX.xml
@@ -71,7 +71,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-eptad' added='yes'/>
<feature name='vmx-eptp-switching' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
diff --git a/src/cpu_map/x86_Haswell.xml b/src/cpu_map/x86_Haswell.xml
index 99986c5c45..583649dbab 100644
--- a/src/cpu_map/x86_Haswell.xml
+++ b/src/cpu_map/x86_Haswell.xml
@@ -73,7 +73,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-eptad' added='yes'/>
<feature name='vmx-eptp-switching' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
diff --git a/src/cpu_map/x86_Icelake-Server-noTSX.xml b/src/cpu_map/x86_Icelake-Server-noTSX.xml
index caba24ab35..8515b6518c 100644
--- a/src/cpu_map/x86_Icelake-Server-noTSX.xml
+++ b/src/cpu_map/x86_Icelake-Server-noTSX.xml
@@ -99,7 +99,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-eptad' added='yes'/>
<feature name='vmx-eptp-switching' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
diff --git a/src/cpu_map/x86_Icelake-Server.xml b/src/cpu_map/x86_Icelake-Server.xml
index 5a864b2fad..9d0cc254c0 100644
--- a/src/cpu_map/x86_Icelake-Server.xml
+++ b/src/cpu_map/x86_Icelake-Server.xml
@@ -101,7 +101,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-eptad' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
<feature name='vmx-exit-load-efer' added='yes'/>
diff --git a/src/cpu_map/x86_IvyBridge-IBRS.xml b/src/cpu_map/x86_IvyBridge-IBRS.xml
index 27d85d86c4..4822b546e9 100644
--- a/src/cpu_map/x86_IvyBridge-IBRS.xml
+++ b/src/cpu_map/x86_IvyBridge-IBRS.xml
@@ -66,7 +66,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
<feature name='vmx-exit-load-efer' added='yes'/>
<feature name='vmx-exit-load-pat' added='yes'/>
diff --git a/src/cpu_map/x86_IvyBridge.xml b/src/cpu_map/x86_IvyBridge.xml
index 72031cfdc6..93edca17ca 100644
--- a/src/cpu_map/x86_IvyBridge.xml
+++ b/src/cpu_map/x86_IvyBridge.xml
@@ -65,7 +65,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
<feature name='vmx-exit-load-efer' added='yes'/>
<feature name='vmx-exit-load-pat' added='yes'/>
diff --git a/src/cpu_map/x86_Nehalem-IBRS.xml b/src/cpu_map/x86_Nehalem-IBRS.xml
index 0cfee14c0f..a6510aa99f 100644
--- a/src/cpu_map/x86_Nehalem-IBRS.xml
+++ b/src/cpu_map/x86_Nehalem-IBRS.xml
@@ -55,7 +55,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
<feature name='vmx-exit-load-efer' added='yes'/>
<feature name='vmx-exit-load-pat' added='yes'/>
diff --git a/src/cpu_map/x86_Nehalem.xml b/src/cpu_map/x86_Nehalem.xml
index 74ee64ce1c..6c0dfba451 100644
--- a/src/cpu_map/x86_Nehalem.xml
+++ b/src/cpu_map/x86_Nehalem.xml
@@ -54,7 +54,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
<feature name='vmx-exit-load-efer' added='yes'/>
<feature name='vmx-exit-load-pat' added='yes'/>
diff --git a/src/cpu_map/x86_SandyBridge-IBRS.xml b/src/cpu_map/x86_SandyBridge-IBRS.xml
index 297eea8e88..6d2b5028ee 100644
--- a/src/cpu_map/x86_SandyBridge-IBRS.xml
+++ b/src/cpu_map/x86_SandyBridge-IBRS.xml
@@ -58,7 +58,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
<feature name='vmx-exit-load-efer' added='yes'/>
<feature name='vmx-exit-load-pat' added='yes'/>
diff --git a/src/cpu_map/x86_SandyBridge.xml b/src/cpu_map/x86_SandyBridge.xml
index 20ea378c47..de3ad60e3d 100644
--- a/src/cpu_map/x86_SandyBridge.xml
+++ b/src/cpu_map/x86_SandyBridge.xml
@@ -57,7 +57,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
<feature name='vmx-exit-load-efer' added='yes'/>
<feature name='vmx-exit-load-pat' added='yes'/>
diff --git a/src/cpu_map/x86_SapphireRapids.xml b/src/cpu_map/x86_SapphireRapids.xml
index 40164a47e2..6321dd36d9 100644
--- a/src/cpu_map/x86_SapphireRapids.xml
+++ b/src/cpu_map/x86_SapphireRapids.xml
@@ -122,7 +122,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-eptad' added='yes'/>
<feature name='vmx-eptp-switching' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
diff --git a/src/cpu_map/x86_Skylake-Client-IBRS.xml b/src/cpu_map/x86_Skylake-Client-IBRS.xml
index f36a8bd210..7d0d3c7114 100644
--- a/src/cpu_map/x86_Skylake-Client-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Client-IBRS.xml
@@ -83,7 +83,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-eptad' added='yes'/>
<feature name='vmx-eptp-switching' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
diff --git a/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml b/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
index 5150117db4..383270f5f9 100644
--- a/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
@@ -81,7 +81,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-eptad' added='yes'/>
<feature name='vmx-eptp-switching' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
diff --git a/src/cpu_map/x86_Skylake-Client.xml b/src/cpu_map/x86_Skylake-Client.xml
index 061c0dfaec..84789d642a 100644
--- a/src/cpu_map/x86_Skylake-Client.xml
+++ b/src/cpu_map/x86_Skylake-Client.xml
@@ -82,7 +82,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-eptad' added='yes'/>
<feature name='vmx-eptp-switching' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
diff --git a/src/cpu_map/x86_Skylake-Server-IBRS.xml b/src/cpu_map/x86_Skylake-Server-IBRS.xml
index bbd3c8998e..8cd25a2df4 100644
--- a/src/cpu_map/x86_Skylake-Server-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Server-IBRS.xml
@@ -88,7 +88,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-eptad' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
<feature name='vmx-exit-load-efer' added='yes'/>
diff --git a/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml b/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
index ee0d2a2fa3..f3877bfbec 100644
--- a/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
@@ -86,7 +86,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-eptad' added='yes'/>
<feature name='vmx-eptp-switching' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
diff --git a/src/cpu_map/x86_Skylake-Server.xml b/src/cpu_map/x86_Skylake-Server.xml
index 9d9d112d40..78bd727357 100644
--- a/src/cpu_map/x86_Skylake-Server.xml
+++ b/src/cpu_map/x86_Skylake-Server.xml
@@ -87,7 +87,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-eptad' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
<feature name='vmx-exit-load-efer' added='yes'/>
diff --git a/src/cpu_map/x86_Snowridge.xml b/src/cpu_map/x86_Snowridge.xml
index bc410bd8f8..b31ce6f9f5 100644
--- a/src/cpu_map/x86_Snowridge.xml
+++ b/src/cpu_map/x86_Snowridge.xml
@@ -81,7 +81,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-eptad' added='yes'/>
<feature name='vmx-eptp-switching' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
diff --git a/src/cpu_map/x86_Westmere-IBRS.xml b/src/cpu_map/x86_Westmere-IBRS.xml
index a5abe8a1e1..534c752ed9 100644
--- a/src/cpu_map/x86_Westmere-IBRS.xml
+++ b/src/cpu_map/x86_Westmere-IBRS.xml
@@ -53,7 +53,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
<feature name='vmx-exit-load-efer' added='yes'/>
<feature name='vmx-exit-load-pat' added='yes'/>
diff --git a/src/cpu_map/x86_Westmere.xml b/src/cpu_map/x86_Westmere.xml
index 161f1a078e..4edc5b3839 100644
--- a/src/cpu_map/x86_Westmere.xml
+++ b/src/cpu_map/x86_Westmere.xml
@@ -54,7 +54,6 @@
<feature name='vmx-ept-1gb' added='yes'/>
<feature name='vmx-ept-2mb' added='yes'/>
<feature name='vmx-ept-execonly' added='yes'/>
- <feature name='vmx-ept-wb' added='yes'/>
<feature name='vmx-exit-ack-intr' added='yes'/>
<feature name='vmx-exit-load-efer' added='yes'/>
<feature name='vmx-exit-load-pat' added='yes'/>
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index f930ad2acf..45565326a5 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3534,6 +3534,7 @@ virQEMUCapsProbeQMPSGXCapabilities(virQEMUCaps *qemuCaps,
const char *ignoredFeatures[] = {
"cmt", "mbm_total", "mbm_local", /* never supported by QEMU */
"osxsave", "ospke", /* dropped from QEMU */
+ "vmx-ept-uc", "vmx-ept-wb", /* never supported by QEMU */
};
bool
--
2.46.2
