openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "conf: Introduce MTE domain feature" 

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: 720e8f13ff
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
Andrea Bolognani 2023-05-22 09:50:20 +02:00
parent 4fd5f0d660
commit 3b6d69237f
7 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/formatdomain.rst
View File

@ -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
------------

6
src/conf/domain_conf.c
View File

@ -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:

1
src/conf/domain_conf.h
View File

@ -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;

5
src/conf/schemas/domaincommon.rng
View File

@ -6653,11 +6653,6 @@
<optional>
<ref name="tcgfeatures"/>
</optional>
<optional>
<element name="mte">
<ref name="featurestate"/>
</element>
</optional>
</interleave>
</element>
</optional>

1
src/qemu/qemu_validate.c
View File

@ -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,

1
tests/qemuxml2argvdata/aarch64-gic-v3.xml
View File

@ -10,7 +10,6 @@
</os>
<features>
<gic version='3'/>
<mte state='on'/>
</features>
<cpu mode='host-passthrough' check='none'/>
<clock offset='utc'/>

1
tests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml
View File

@ -10,7 +10,6 @@
</os>
<features>
<gic version='3'/>
<mte state='on'/>
</features>
<cpu mode='host-passthrough' check='none'/>
<clock offset='utc'/>