The QEMU interface is still in a state of flux, and KVM support
has been pulled shortly after having been merged. Let's not
commit to a stable interface in libvirt just yet.
Reverts: 720e8f13ff71377580cd37b118cee8a1f982d1d8
Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
---
docs/formatdomain.rst | 7 -------
src/conf/domain_conf.c | 6 +-----
src/conf/domain_conf.h | 1 -
src/conf/schemas/domaincommon.rng | 5 -----
src/qemu/qemu_validate.c | 1 -
tests/qemuxml2argvdata/aarch64-gic-v3.xml | 1 -
tests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml | 1 -
7 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index b46eefb0f6..dd28a565e1 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -2000,7 +2000,6 @@ Hypervisors may allow certain CPU / machine features to be toggled on/off.
<tcg>
<tb-cache unit='MiB'>128</tb-cache>
</tcg>
- <mte state='on'/>
</features>
...
@@ -2231,12 +2230,6 @@ are:
tb-cache The size of translation block cache size an integer (a multiple of MiB) :since:`8.0.0`
=========== ============================================== =================================================== ==============
-``mte``
- Configure Memory Tagging Extensions for ARM guests. Possible values for the
- ``state`` attribute are ``on`` and ``off``. If the attribute is not
- defined, the hypervisor default will be used. :since:`Since 9.4.0` (QEMU/KVM
- only)
-
Time keeping
------------
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 047a4c97bf..6a864a8db9 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -181,7 +181,6 @@ VIR_ENUM_IMPL(virDomainFeature,
"sbbc",
"ibs",
"tcg",
- "mte",
);
VIR_ENUM_IMPL(virDomainCapabilitiesPolicy,
@@ -16646,8 +16645,7 @@ virDomainFeaturesDefParse(virDomainDef *def,
case VIR_DOMAIN_FEATURE_HTM:
case VIR_DOMAIN_FEATURE_NESTED_HV:
- case VIR_DOMAIN_FEATURE_CCF_ASSIST:
- case VIR_DOMAIN_FEATURE_MTE: {
+ case VIR_DOMAIN_FEATURE_CCF_ASSIST: {
virTristateSwitch state;
if (virXMLPropTristateSwitch(nodes[i], "state",
@@ -20488,7 +20486,6 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src,
case VIR_DOMAIN_FEATURE_HTM:
case VIR_DOMAIN_FEATURE_NESTED_HV:
case VIR_DOMAIN_FEATURE_CCF_ASSIST:
- case VIR_DOMAIN_FEATURE_MTE:
if (src->features[i] != dst->features[i]) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("State of feature '%1$s' differs: source: '%2$s', destination: '%3$s'"),
@@ -27008,7 +27005,6 @@ virDomainDefFormatFeatures(virBuffer *buf,
case VIR_DOMAIN_FEATURE_HTM:
case VIR_DOMAIN_FEATURE_NESTED_HV:
case VIR_DOMAIN_FEATURE_CCF_ASSIST:
- case VIR_DOMAIN_FEATURE_MTE:
switch ((virTristateSwitch) def->features[i]) {
case VIR_TRISTATE_SWITCH_LAST:
case VIR_TRISTATE_SWITCH_ABSENT:
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 3f8d6e81c0..c1cb2ed69d 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2169,7 +2169,6 @@ typedef enum {
VIR_DOMAIN_FEATURE_SBBC,
VIR_DOMAIN_FEATURE_IBS,
VIR_DOMAIN_FEATURE_TCG,
- VIR_DOMAIN_FEATURE_MTE,
VIR_DOMAIN_FEATURE_LAST
} virDomainFeature;
diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index 37e350ac2c..f8c7b6a648 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -6653,11 +6653,6 @@
<optional>
<ref name="tcgfeatures"/>
</optional>
- <optional>
- <element name="mte">
- <ref name="featurestate"/>
- </element>
- </optional>
</interleave>
</element>
</optional>
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 99c7775e9b..da4b9a3b35 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -123,7 +123,6 @@ qemuValidateDomainDefFeatures(const virDomainDef *def,
break;
case VIR_DOMAIN_FEATURE_GIC:
- case VIR_DOMAIN_FEATURE_MTE:
if (def->features[i] == VIR_TRISTATE_SWITCH_ON &&
!qemuDomainIsARMVirt(def)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.xml b/tests/qemuxml2argvdata/aarch64-gic-v3.xml
index b9317284b0..247d6025f7 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-v3.xml
+++ b/tests/qemuxml2argvdata/aarch64-gic-v3.xml
@@ -10,7 +10,6 @@
</os>
<features>
<gic version='3'/>
- <mte state='on'/>
</features>
<cpu mode='host-passthrough' check='none'/>
<clock offset='utc'/>
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml
index 1a74903aaa..5b2fb7df75 100644
--- a/tests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml
+++ b/tests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml
@@ -10,7 +10,6 @@
</os>
<features>
<gic version='3'/>
- <mte state='on'/>
</features>
<cpu mode='host-passthrough' check='none'/>
<clock offset='utc'/>
--
2.40.1
