<div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, May 11, 2022 at 2:12 PM Lin Yang <<a href="mailto:lin.a.yang@intel.com">lin.a.yang@intel.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><devices><br>
...<br>
<memory model='sgx-epc'><br>
<target><br>
<size unit='KiB'>512</size><br>
</target><br>
</memory><br>
...<br>
</devices><br>
<br>
Signed-off-by: Lin Yang <<a href="mailto:lin.a.yang@intel.com" target="_blank">lin.a.yang@intel.com</a>><br>
---<br>
docs/formatdomain.rst | 9 +++-<br>
src/conf/domain_conf.c | 6 +++<br>
src/conf/domain_conf.h | 1 +<br>
src/conf/domain_validate.c | 16 ++++++<br>
src/conf/schemas/domaincommon.rng | 1 +<br>
src/qemu/qemu_alias.c | 3 ++<br>
src/qemu/qemu_command.c | 1 +<br>
src/qemu/qemu_domain.c | 38 +++++++++-----<br>
src/qemu/qemu_domain_address.c | 6 +++<br>
src/qemu/qemu_driver.c | 1 +<br>
src/qemu/qemu_process.c | 2 +<br>
src/qemu/qemu_validate.c | 8 +++<br>
src/security/security_apparmor.c | 1 +<br>
src/security/security_dac.c | 2 +<br>
src/security/security_selinux.c | 2 +<br>
tests/qemuxml2argvdata/sgx-epc.xml | 36 +++++++++++++<br>
.../sgx-epc.x86_64-latest.xml | 52 +++++++++++++++++++<br>
tests/qemuxml2xmltest.c | 2 +<br>
18 files changed, 172 insertions(+), 15 deletions(-)<br>
create mode 100644 tests/qemuxml2argvdata/sgx-epc.xml<br>
create mode 100644 tests/qemuxml2xmloutdata/sgx-epc.x86_64-latest.xml<br>
<br>
diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst<br>
index 9be305f3e6..cdb61068b9 100644<br>
--- a/docs/formatdomain.rst<br>
+++ b/docs/formatdomain.rst<br>
@@ -7836,6 +7836,11 @@ Example: usage of the memory devices<br>
<current unit='KiB'>524288</current><br>
</target><br>
</memory><br>
+ <memory model='sgx-epc'><br>
+ <target><br>
+ <size unit='KiB'>16384</size><br>
+ </target><br>
+ </memory><br>
</devices><br>
...<br>
<br>
@@ -7844,7 +7849,9 @@ Example: usage of the memory devices<br>
1.2.14` Provide ``nvdimm`` model that adds a Non-Volatile DIMM module.<br>
:since:`Since 3.2.0` Provide ``virtio-pmem`` model to add a paravirtualized<br>
persistent memory device. :since:`Since 7.1.0` Provide ``virtio-mem`` model<br>
- to add paravirtualized memory device. :since:`Since 7.9.0`<br>
+ to add paravirtualized memory device. :since:`Since 7.9.0` Provide<br>
+ ``sgx-epc`` model to add a SGX enclave page cache (EPC) memory to the guest.<br>
+ :since:`Since 8.1.0`<br></blockquote><div>s/8.1.0/8.4.0/</div><div>and QEMU 6.2.0<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
``access``<br>
An optional attribute ``access`` ( :since:`since 3.2.0` ) that provides<br>
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c<br>
index bd2884088c..a35f9e6c02 100644<br>
--- a/src/conf/domain_conf.c<br>
+++ b/src/conf/domain_conf.c<br>
@@ -1429,6 +1429,7 @@ VIR_ENUM_IMPL(virDomainMemoryModel,<br>
"nvdimm",<br>
"virtio-pmem",<br>
"virtio-mem",<br>
+ "sgx-epc",<br>
);<br>
<br>
VIR_ENUM_IMPL(virDomainShmemModel,<br>
@@ -5630,6 +5631,7 @@ virDomainMemoryDefPostParse(virDomainMemoryDef *mem,<br>
<br>
case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:<br>
case VIR_DOMAIN_MEMORY_MODEL_DIMM:<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
break;<br>
@@ -14552,6 +14554,7 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node,<br>
def->nvdimmPath = virXPathString("string(./path)", ctxt);<br>
break;<br>
<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
break;<br>
@@ -14620,6 +14623,7 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node,<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
case VIR_DOMAIN_MEMORY_MODEL_DIMM:<br>
case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
break;<br>
}<br>
@@ -16416,6 +16420,7 @@ virDomainMemoryFindByDefInternal(virDomainDef *def,<br>
continue;<br>
break;<br>
<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
break;<br>
@@ -25874,6 +25879,7 @@ virDomainMemorySourceDefFormat(virBuffer *buf,<br>
virBufferEscapeString(&childBuf, "<path>%s</path>\n", def->nvdimmPath);<br>
break;<br>
<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
break;<br>
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h<br>
index 88a411d00c..8c89690ca5 100644<br>
--- a/src/conf/domain_conf.h<br>
+++ b/src/conf/domain_conf.h<br>
@@ -2536,6 +2536,7 @@ typedef enum {<br>
VIR_DOMAIN_MEMORY_MODEL_NVDIMM, /* nvdimm memory device */<br>
VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM, /* virtio-pmem memory device */<br>
VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM, /* virtio-mem memory device */<br>
+ VIR_DOMAIN_MEMORY_MODEL_SGX_EPC, /* SGX enclave page cache */<br>
<br>
VIR_DOMAIN_MEMORY_MODEL_LAST<br>
} virDomainMemoryModel;<br>
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c<br>
index b9cb50ed31..5000261fdd 100644<br>
--- a/src/conf/domain_validate.c<br>
+++ b/src/conf/domain_validate.c<br>
@@ -2158,6 +2158,22 @@ virDomainMemoryDefValidate(const virDomainMemoryDef *mem,<br>
case VIR_DOMAIN_MEMORY_MODEL_DIMM:<br>
break;<br>
<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
+ if (mem->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {<br>
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,<br>
+ _("memory device address is not supported for model '%s'"),<br>
+ virDomainMemoryModelTypeToString(mem->model));<br>
+ return -1;<br>
+ }<br>
+<br>
+ if (mem->targetNode != -1) {<br>
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,<br>
+ _("NUMA nodes is not supported for model '%s'"),<br>
+ virDomainMemoryModelTypeToString(mem->model));<br>
+ return -1;<br>
+ }<br>
+ break;<br>
+<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
default:<br>
diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng<br>
index 8afb0dadd4..ed6bd66326 100644<br>
--- a/src/conf/schemas/domaincommon.rng<br>
+++ b/src/conf/schemas/domaincommon.rng<br>
@@ -6703,6 +6703,7 @@<br>
<value>nvdimm</value><br>
<value>virtio-pmem</value><br>
<value>virtio-mem</value><br>
+ <value>sgx-epc</value><br>
</choice><br>
</attribute><br>
<optional><br>
diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c<br>
index 8c2f055604..e5a946cbed 100644<br>
--- a/src/qemu/qemu_alias.c<br>
+++ b/src/qemu/qemu_alias.c<br>
@@ -516,6 +516,9 @@ qemuAssignDeviceMemoryAlias(virDomainDef *def,<br>
case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:<br>
prefix = "virtiomem";<br>
break;<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
+ prefix = "epc";<br>
+ break;<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
default:<br>
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c<br>
index 3746f02ff0..cb0ddb3467 100644<br>
--- a/src/qemu/qemu_command.c<br>
+++ b/src/qemu/qemu_command.c<br>
@@ -4016,6 +4016,7 @@ qemuBuildMemoryDeviceProps(virQEMUDriverConfig *cfg,<br>
return NULL;<br>
break;<br>
<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
default:<br>
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c<br>
index 7974cdb00b..33de07bfd7 100644<br>
--- a/src/qemu/qemu_domain.c<br>
+++ b/src/qemu/qemu_domain.c<br>
@@ -8401,6 +8401,7 @@ qemuDomainUpdateMemoryDeviceInfo(virQEMUDriver *driver,<br>
break;<br>
<br>
case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
break;<br>
@@ -9082,6 +9083,12 @@ qemuDomainDefValidateMemoryHotplugDevice(const virDomainMemoryDef *mem,<br>
}<br>
break;<br>
<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,<br>
+ _("hotplug are not supported for the %s device"),<br>
+ virDomainMemoryModelTypeToString(mem->model));<br>
+ return -1;<br>
+<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
return -1;<br>
@@ -9117,7 +9124,7 @@ int<br>
qemuDomainDefValidateMemoryHotplug(const virDomainDef *def,<br>
const virDomainMemoryDef *mem)<br>
{<br>
- unsigned int nmems = def->nmems;<br>
+ unsigned int hotplugNum = 0;<br>
unsigned long long hotplugSpace;<br>
unsigned long long hotplugMemory = 0;<br>
size_t i;<br>
@@ -9125,15 +9132,27 @@ qemuDomainDefValidateMemoryHotplug(const virDomainDef *def,<br>
hotplugSpace = def->mem.max_memory - virDomainDefGetMemoryInitial(def);<br>
<br>
if (mem) {<br>
- nmems++;<br>
+ hotplugNum++;<br>
hotplugMemory = mem->size;<br>
<br>
if (qemuDomainDefValidateMemoryHotplugDevice(mem, def) < 0)<br>
return -1;<br>
}<br>
<br>
+ for (i = 0; i < def->nmems; i++) {<br>
+ /* sgx epc memory does not support hotplug */<br>
+ if (def->mems[i]->model != VIR_DOMAIN_MEMORY_MODEL_SGX_EPC) {<br>
+ hotplugMemory += def->mems[i]->size;<br>
+ hotplugNum++;<br>
+ /* already existing devices don't need to be checked on hotplug */<br>
+ if (!mem &&<br>
+ qemuDomainDefValidateMemoryHotplugDevice(def->mems[i], def) < 0)<br>
+ return -1;<br>
+ }<br>
+ }<br>
+<br>
if (!virDomainDefHasMemoryHotplug(def)) {<br>
- if (nmems) {<br>
+ if (hotplugNum) {<br>
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",<br>
_("cannot use/hotplug a memory device when domain "<br>
"'maxMemory' is not defined"));<br>
@@ -9156,22 +9175,13 @@ qemuDomainDefValidateMemoryHotplug(const virDomainDef *def,<br>
}<br>
}<br>
<br>
- if (nmems > def->mem.memory_slots) {<br>
+ if (hotplugNum > def->mem.memory_slots) {<br>
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,<br>
_("memory device count '%u' exceeds slots count '%u'"),<br>
- nmems, def->mem.memory_slots);<br>
+ hotplugNum, def->mem.memory_slots);<br>
return -1;<br>
}<br>
<br>
- for (i = 0; i < def->nmems; i++) {<br>
- hotplugMemory += def->mems[i]->size;<br>
-<br>
- /* already existing devices don't need to be checked on hotplug */<br>
- if (!mem &&<br>
- qemuDomainDefValidateMemoryHotplugDevice(def->mems[i], def) < 0)<br>
- return -1;<br>
- }<br>
-<br>
if (hotplugMemory > hotplugSpace) {<br>
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",<br>
_("memory device total size exceeds hotplug space"));<br>
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c<br>
index 753733d1b9..a111ae4d0c 100644<br>
--- a/src/qemu/qemu_domain_address.c<br>
+++ b/src/qemu/qemu_domain_address.c<br>
@@ -389,6 +389,7 @@ qemuDomainPrimeVirtioDeviceAddresses(virDomainDef *def,<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
case VIR_DOMAIN_MEMORY_MODEL_DIMM:<br>
case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
break;<br>
}<br>
@@ -1039,6 +1040,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDef *dev,<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
case VIR_DOMAIN_MEMORY_MODEL_DIMM:<br>
case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
return 0;<br>
}<br>
@@ -2421,6 +2423,7 @@ qemuDomainAssignDevicePCISlots(virDomainDef *def,<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
case VIR_DOMAIN_MEMORY_MODEL_DIMM:<br>
case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
break;<br>
}<br>
@@ -3081,6 +3084,7 @@ qemuDomainAssignMemoryDeviceSlot(virDomainObj *vm,<br>
return qemuDomainEnsurePCIAddress(vm, &dev);<br>
break;<br>
<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
break;<br>
@@ -3107,6 +3111,7 @@ qemuDomainReleaseMemoryDeviceSlot(virDomainObj *vm,<br>
qemuDomainReleaseDeviceAddress(vm, &mem->info);<br>
break;<br>
<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
break;<br>
@@ -3140,6 +3145,7 @@ qemuDomainAssignMemorySlots(virDomainDef *def)<br>
case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:<br>
/* handled in qemuDomainAssignPCIAddresses() */<br>
break;<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
break;<br>
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c<br>
index e3582f62a7..0dd4c86830 100644<br>
--- a/src/qemu/qemu_driver.c<br>
+++ b/src/qemu/qemu_driver.c<br>
@@ -7002,6 +7002,7 @@ qemuDomainChangeMemoryLiveValidateChange(const virDomainMemoryDef *oldDef,<br>
case VIR_DOMAIN_MEMORY_MODEL_DIMM:<br>
case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:<br>
case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,<br>
_("cannot modify memory of model '%s'"),<br>
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c<br>
index b0b00eb0a2..34cbea9bee 100644<br>
--- a/src/qemu/qemu_process.c<br>
+++ b/src/qemu/qemu_process.c<br>
@@ -3799,6 +3799,7 @@ qemuProcessDomainMemoryDefNeedHugepagesPath(const virDomainMemoryDef *mem,<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:<br>
case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
/* None of these can be backed by hugepages. */<br>
return false;<br>
@@ -3873,6 +3874,7 @@ qemuProcessNeedMemoryBackingPath(virDomainDef *def,<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:<br>
case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
/* Backed by user provided path. Not stored in memory<br>
* backing dir anyway. */<br>
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c<br>
index b576efe375..713610482a 100644<br>
--- a/src/qemu/qemu_validate.c<br>
+++ b/src/qemu/qemu_validate.c<br>
@@ -5053,6 +5053,14 @@ qemuValidateDomainDeviceDefMemory(virDomainMemoryDef *mem,<br>
}<br>
break;<br>
<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
+ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC)) {<br>
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",<br>
+ _("sgx epc isn't supported by this QEMU binary"));<br>
+ return -1;<br>
+ }<br>
+ break;<br>
+<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
break;<br>
diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c<br>
index 8f7acba980..c0ce9cdbc9 100644<br>
--- a/src/security/security_apparmor.c<br>
+++ b/src/security/security_apparmor.c<br>
@@ -687,6 +687,7 @@ AppArmorSetMemoryLabel(virSecurityManager *mgr,<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
case VIR_DOMAIN_MEMORY_MODEL_DIMM:<br>
case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
break;<br>
}<br>
diff --git a/src/security/security_dac.c b/src/security/security_dac.c<br>
index e9e316551e..5bbe4cd771 100644<br>
--- a/src/security/security_dac.c<br>
+++ b/src/security/security_dac.c<br>
@@ -1850,6 +1850,7 @@ virSecurityDACRestoreMemoryLabel(virSecurityManager *mgr,<br>
<br>
case VIR_DOMAIN_MEMORY_MODEL_DIMM:<br>
case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
ret = 0;<br>
@@ -2035,6 +2036,7 @@ virSecurityDACSetMemoryLabel(virSecurityManager *mgr,<br>
<br>
case VIR_DOMAIN_MEMORY_MODEL_DIMM:<br>
case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
ret = 0;<br>
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c<br>
index 6f02baf2ce..b95fb14c32 100644<br>
--- a/src/security/security_selinux.c<br>
+++ b/src/security/security_selinux.c<br>
@@ -1582,6 +1582,7 @@ virSecuritySELinuxSetMemoryLabel(virSecurityManager *mgr,<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
case VIR_DOMAIN_MEMORY_MODEL_DIMM:<br>
case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
break;<br>
}<br>
@@ -1610,6 +1611,7 @@ virSecuritySELinuxRestoreMemoryLabel(virSecurityManager *mgr,<br>
<br>
case VIR_DOMAIN_MEMORY_MODEL_DIMM:<br>
case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:<br>
+ case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:<br>
case VIR_DOMAIN_MEMORY_MODEL_NONE:<br>
case VIR_DOMAIN_MEMORY_MODEL_LAST:<br>
ret = 0;<br>
diff --git a/tests/qemuxml2argvdata/sgx-epc.xml b/tests/qemuxml2argvdata/sgx-epc.xml<br>
new file mode 100644<br>
index 0000000000..65ae8ae296<br>
--- /dev/null<br>
+++ b/tests/qemuxml2argvdata/sgx-epc.xml<br>
@@ -0,0 +1,36 @@<br>
+<domain type='qemu'><br>
+ <name>QEMUGuest1</name><br>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid><br>
+ <memory unit='KiB'>219100</memory><br>
+ <currentMemory unit='KiB'>219100</currentMemory><br>
+ <vcpu placement='static'>1</vcpu><br>
+ <os><br>
+ <type arch='x86_64' machine='q35'>hvm</type><br>
+ <boot dev='hd'/><br>
+ </os><br>
+ <clock offset='utc'/><br>
+ <on_poweroff>destroy</on_poweroff><br>
+ <on_reboot>restart</on_reboot><br>
+ <on_crash>destroy</on_crash><br>
+ <devices><br>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator><br>
+ <controller type='pci' index='0' model='pcie-root'/><br>
+ <controller type='usb' index='0' model='none'/><br>
+ <controller type='sata' index='0'><br>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/><br>
+ </controller><br>
+ <input type='mouse' bus='ps2'/><br>
+ <input type='keyboard' bus='ps2'/><br>
+ <audio id='1' type='none'/><br>
+ <memory model='sgx-epc'><br>
+ <target><br>
+ <size unit='MiB'>64</size><br>
+ </target><br>
+ </memory><br>
+ <memory model='sgx-epc'><br>
+ <target><br>
+ <size unit='MiB'>16</size><br>
+ </target><br>
+ </memory><br>
+ </devices><br>
+</domain><br>
diff --git a/tests/qemuxml2xmloutdata/sgx-epc.x86_64-latest.xml b/tests/qemuxml2xmloutdata/sgx-epc.x86_64-latest.xml<br>
new file mode 100644<br>
index 0000000000..1f2a9c418f<br>
--- /dev/null<br>
+++ b/tests/qemuxml2xmloutdata/sgx-epc.x86_64-latest.xml<br>
@@ -0,0 +1,52 @@<br>
+<domain type='qemu'><br>
+ <name>QEMUGuest1</name><br>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid><br>
+ <memory unit='KiB'>219100</memory><br>
+ <currentMemory unit='KiB'>219100</currentMemory><br>
+ <vcpu placement='static'>1</vcpu><br>
+ <os><br>
+ <type arch='x86_64' machine='q35'>hvm</type><br>
+ <boot dev='hd'/><br>
+ </os><br>
+ <cpu mode='custom' match='exact' check='none'><br>
+ <model fallback='forbid'>qemu64</model><br>
+ </cpu><br>
+ <clock offset='utc'/><br>
+ <on_poweroff>destroy</on_poweroff><br>
+ <on_reboot>restart</on_reboot><br>
+ <on_crash>destroy</on_crash><br>
+ <devices><br>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator><br>
+ <controller type='pci' index='0' model='pcie-root'/><br>
+ <controller type='usb' index='0' model='none'/><br>
+ <controller type='sata' index='0'><br>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/><br>
+ </controller><br>
+ <controller type='pci' index='1' model='pcie-root-port'><br>
+ <model name='pcie-root-port'/><br>
+ <target chassis='1' port='0x8'/><br>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/><br>
+ </controller><br>
+ <controller type='pci' index='2' model='pcie-root-port'><br>
+ <model name='pcie-root-port'/><br>
+ <target chassis='2' port='0x9'/><br>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/><br>
+ </controller><br>
+ <input type='mouse' bus='ps2'/><br>
+ <input type='keyboard' bus='ps2'/><br>
+ <audio id='1' type='none'/><br>
+ <memballoon model='virtio'><br>
+ <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/><br>
+ </memballoon><br>
+ <memory model='sgx-epc'><br>
+ <target><br>
+ <size unit='KiB'>65536</size><br>
+ </target><br>
+ </memory><br>
+ <memory model='sgx-epc'><br>
+ <target><br>
+ <size unit='KiB'>16384</size><br>
+ </target><br>
+ </memory><br>
+ </devices><br>
+</domain><br>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c<br>
index 58ee29cd33..51f805dcab 100644<br>
--- a/tests/qemuxml2xmltest.c<br>
+++ b/tests/qemuxml2xmltest.c<br>
@@ -1468,6 +1468,8 @@ mymain(void)<br>
QEMU_CAPS_DEVICE_VIRTIO_RNG,<br>
QEMU_CAPS_OBJECT_RNG_RANDOM);<br>
<br>
+ DO_TEST_CAPS_LATEST("sgx-epc");<br>
+<br>
cleanup:<br>
if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)<br>
virFileDeleteTree(fakerootdir);<br>
-- <br>
2.25.1<br>
<br>
</blockquote></div></div>