From: Michal Privoznik Date: Tue, 28 Mar 2023 08:39:55 +0000 (+0200) Subject: conf: Introduce
for virtio-mem and virtio-pmem X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=677156f6622c7d1e783e0c4610620768c20c154e;p=libvirt.git conf: Introduce
for virtio-mem and virtio-pmem Both virtio-mem and virtio-pmem devices have '.memaddr' attribute which controls the address where they are mapped in the guest memory. Ideally, users do not need to specify this as QEMU does the right thing and computes addresses automatically on startup. But soon, we will need to record this address as it is part of guest ABI. And also, there might be some users that want to control this value. Now, we are in a bit of a pickle, because both these device types already have a PCI address, therefore we can't just use
blindly. But what we can do, is introduce
under the element. This is also more conceptual, as knobs under control guest visible config of memory device (and .memaddr surely falls into that category). NB, SgxEPCDeviceInfo struct in QMP definition also has .memaddr attribute, but because of the way we build cmd line there's no (easy) way to set the attribute. So ignore that for now. Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index dd28a565e1..c3526439bf 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -8129,6 +8129,7 @@ Example: usage of the memory devices 524288 +
@@ -8142,6 +8143,7 @@ Example: usage of the memory devices 2048 1048576 524288 +
@@ -8285,6 +8287,11 @@ Example: usage of the memory devices element is formatted into live XML and never parsed, i.e. it is output-only element. + ``address`` + For ``virtio-mem`` and ``virtio-pmem`` only. + The physical address in memory, where device is mapped. :since:`Since + 9.4.0` + IOMMU devices ~~~~~~~~~~~~~ diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6a864a8db9..e7226c5f99 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13318,6 +13318,7 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node, virDomainMemoryDef *def) { VIR_XPATH_NODE_AUTORESTORE(ctxt) + xmlNodePtr addrNode = NULL; int rv; ctxt->node = node; @@ -13363,16 +13364,27 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node, if (virDomainParseMemory("./requested", "./requested/@unit", ctxt, &def->requestedsize, false, false) < 0) return -1; + + addrNode = virXPathNode("./address", ctxt); + break; + + case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM: + addrNode = virXPathNode("./address", ctxt); break; case VIR_DOMAIN_MEMORY_MODEL_NONE: case VIR_DOMAIN_MEMORY_MODEL_DIMM: - case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM: case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC: case VIR_DOMAIN_MEMORY_MODEL_LAST: break; } + if (addrNode && + virXMLPropULongLong(addrNode, "base", 16, + VIR_XML_PROP_NONE, &def->address) < 0) { + return -1; + } + return 0; } @@ -20952,6 +20964,13 @@ virDomainMemoryDefCheckABIStability(virDomainMemoryDef *src, return false; } + if (src->address != dst->address) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target memory device address '0x%1$llx' doesn't match source memory device address '0x%2$llx'"), + dst->address, src->address); + return false; + } + if (src->model == VIR_DOMAIN_MEMORY_MODEL_NVDIMM) { if (src->labelsize != dst->labelsize) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -25120,6 +25139,9 @@ virDomainMemoryTargetDefFormat(virBuffer *buf, } } + if (def->address) + virBufferAsprintf(&childBuf, "
\n", def->address); + virXMLFormatElement(buf, "target", NULL, &childBuf); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index c1cb2ed69d..629e32c39f 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2652,6 +2652,8 @@ struct _virDomainMemoryDef { unsigned long long currentsize; /* kibibytes, valid for VIRTIO_MEM and active domain only, only to report never parse */ + unsigned long long address; /* address where memory is mapped, valid for + VIRTIO_PMEM and VIRTIO_MEM only. */ bool readonly; /* valid only for NVDIMM */ /* required for QEMU NVDIMM ppc64 support */ diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index e04b85fee4..80d6a2ffd9 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -2355,6 +2355,12 @@ virDomainMemoryDefValidate(const virDomainMemoryDef *mem, _("requested size must be an integer multiple of block size")); return -1; } + + if (mem->address % mem->blocksize != 0) { + virReportError(VIR_ERR_XML_DETAIL, "%s", + _("memory device address must be aligned to blocksize")); + return -1; + } break; case VIR_DOMAIN_MEMORY_MODEL_DIMM: diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng index f8c7b6a648..c1725bb511 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -7177,6 +7177,13 @@ + + + + + + + diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml index 73036d8602..f5cc4a35ed 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml @@ -65,6 +65,7 @@ 0 2048 1048576 +
diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml index 4cebd294ec..21b90e4d8a 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml @@ -47,6 +47,7 @@ 524288 +