6:58 a.m.
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 <address/> blindly. But what we can do, is
introduce <address/> under the <target/> element. This is also
more conceptual, as knobs under <target/> 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 <mprivozn(a)redhat.com>
---
docs/formatdomain.rst | 7 ++++++
src/conf/domain_conf.c | 24 ++++++++++++++++++-
src/conf/domain_conf.h | 2 ++
src/conf/domain_validate.c | 6 +++++
src/conf/schemas/domaincommon.rng | 7 ++++++
.../memory-hotplug-virtio-mem.xml | 1 +
.../memory-hotplug-virtio-pmem.xml | 1 +
7 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index 27f83e254d..092d2296d5 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -8100,6 +8100,7 @@ Example: usage of the memory devices
</source>
<target>
<size unit='KiB'>524288</size>
+ <address base='0x140000000'/>
</target>
</memory>
<memory model='virtio-mem'>
@@ -8113,6 +8114,7 @@ Example: usage of the memory devices
<block unit='KiB'>2048</block>
<requested unit='KiB'>1048576</requested>
<current unit='KiB'>524288</current>
+ <address base='0x150000000'/>
</target>
</memory>
<memory model='sgx-epc'>
@@ -8256,6 +8258,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.3.0`
+
IOMMU devices
~~~~~~~~~~~~~
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 9f49c6e62d..bed6acac3a 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -13377,6 +13377,7 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node,
virDomainMemoryDef *def)
{
VIR_XPATH_NODE_AUTORESTORE(ctxt)
+ xmlNodePtr addrNode = NULL;
int rv;
ctxt->node = node;
@@ -13422,16 +13423,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;
}
@@ -20996,6 +21008,13 @@ virDomainMemoryDefCheckABIStability(virDomainMemoryDef *src,
return false;
}
+ if (src->address != dst->address) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("Target memory device address '0x%llx' doesn't
match source memory device address '0x%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,
@@ -25184,6 +25203,9 @@ virDomainMemoryTargetDefFormat(virBuffer *buf,
}
}
+ if (def->address)
+ virBufferAsprintf(&childBuf, "<address
base='0x%llx'/>\n", def->address);
+
virXMLFormatElement(buf, "target", NULL, &childBuf);
}
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 5a2c70f012..0a8e877a63 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2646,6 +2646,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 f208c0c531..ad76a21ca2 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -2358,6 +2358,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 6158ed79ac..9af47f9688 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -7153,6 +7153,13 @@
<empty/>
</element>
</optional>
+ <optional>
+ <element name="address">
+ <attribute name="base">
+ <ref name="hexuint"/>
+ </attribute>
+ </element>
+ </optional>
</interleave>
</element>
</define>
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 @@
<node>0</node>
<block unit='KiB'>2048</block>
<requested unit='KiB'>1048576</requested>
+ <address base='0x150000000'/>
</target>
<address type='pci' domain='0x0000' bus='0x01'
slot='0x01' function='0x0'/>
</memory>
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 @@
</source>
<target>
<size unit='KiB'>524288</size>
+ <address base='0x140000000'/>
</target>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</memory>
--
2.39.2