7:24 a.m.
Just the default one now, new ones will be added in following commits.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
docs/schemas/domaincommon.rng | 9 +++++
src/conf/domain_conf.c | 44 +++++++++++++++++------
src/conf/domain_conf.h | 8 +++++
src/libvirt_private.syms | 2 ++
src/qemu/qemu_command.c | 11 +++++-
tests/qemuxml2argvdata/qemuxml2argv-shmem.xml | 2 ++
tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem.xml | 8 +++++
7 files changed, 72 insertions(+), 12 deletions(-)
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 95c7882cb73d..43c8b6696ac7 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -3587,6 +3587,15 @@
<attribute name="name"/>
<interleave>
<optional>
+ <element name="model">
+ <attribute name="type">
+ <choice>
+ <value>ivshmem</value>
+ </choice>
+ </attribute>
+ </element>
+ </optional>
+ <optional>
<element name="size">
<ref name="scaledInteger"/>
</element>
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index dbf6eca57153..ed9a86af0f4e 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -843,6 +843,9 @@ VIR_ENUM_IMPL(virDomainBlockJob, VIR_DOMAIN_BLOCK_JOB_TYPE_LAST,
VIR_ENUM_IMPL(virDomainMemoryModel, VIR_DOMAIN_MEMORY_MODEL_LAST,
"", "dimm")
+VIR_ENUM_IMPL(virDomainShmemModel, VIR_DOMAIN_SHMEM_MODEL_LAST,
+ "ivshmem")
+
static virClassPtr virDomainObjClass;
static virClassPtr virDomainXMLOptionClass;
static void virDomainObjDispose(void *obj);
@@ -12244,6 +12247,20 @@ virDomainShmemDefParseXML(xmlNodePtr node,
ctxt->node = node;
+ tmp = virXPathString("string(./model/@type)", ctxt);
+ if (tmp) {
+ /* If there's none, we will automatically have the first one
+ * (as default). Unfortunately this has to be done for
+ * compatibility reasons. */
+ if ((def->model = virDomainShmemModelTypeFromString(tmp)) < 0) {
+ virReportError(VIR_ERR_XML_ERROR,
+ _("Unknown shmem model type '%s'"), tmp);
+ goto cleanup;
+ }
+
+ VIR_FREE(tmp);
+ }
+
if (!(def->name = virXMLPropString(node, "name"))) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("shmem element must contain 'name'
attribute"));
@@ -14824,6 +14841,9 @@ virDomainShmemDefEquals(virDomainShmemDefPtr src,
if (src->size != dst->size)
return false;
+ if (src->model != dst->model)
+ return false;
+
if (src->server.enabled != dst->server.enabled)
return false;
@@ -18811,6 +18831,15 @@ virDomainShmemDefCheckABIStability(virDomainShmemDefPtr src,
return false;
}
+ if (src->model != dst->model) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("Target shared memory model '%s' does not match
"
+ "source model '%s'"),
+ virDomainShmemModelTypeToString(dst->model),
+ virDomainShmemModelTypeToString(src->model));
+ return false;
+ }
+
if (src->size != dst->size) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Target shared memory size '%llu' does not match
"
@@ -21888,20 +21917,13 @@ virDomainShmemDefFormat(virBufferPtr buf,
virDomainShmemDefPtr def,
unsigned int flags)
{
- virBufferEscapeString(buf, "<shmem name='%s'", def->name);
-
- if (!def->size &&
- !def->server.enabled &&
- !def->msi.enabled &&
- !virDomainDeviceInfoNeedsFormat(&def->info, flags)) {
- virBufferAddLit(buf, "/>\n");
- return 0;
- } else {
- virBufferAddLit(buf, ">\n");
- }
+ virBufferEscapeString(buf, "<shmem name='%s'>\n",
def->name);
virBufferAdjustIndent(buf, 2);
+ virBufferAsprintf(buf, "<model type='%s'/>\n",
+ virDomainShmemModelTypeToString(def->model));
+
if (def->size)
virBufferAsprintf(buf, "<size
unit='M'>%llu</size>\n", def->size >> 20);
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index d2065cf3edea..4e74c5611b2e 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1554,9 +1554,16 @@ struct _virDomainNVRAMDef {
virDomainDeviceInfo info;
};
+typedef enum {
+ VIR_DOMAIN_SHMEM_MODEL_IVSHMEM,
+
+ VIR_DOMAIN_SHMEM_MODEL_LAST
+} virDomainShmemModel;
+
struct _virDomainShmemDef {
char *name;
unsigned long long size;
+ int model; /* enum virDomainShmemModel */
struct {
bool enabled;
virDomainChrSourceDef chr;
@@ -3074,6 +3081,7 @@ VIR_ENUM_DECL(virDomainTPMBackend)
VIR_ENUM_DECL(virDomainMemoryModel)
VIR_ENUM_DECL(virDomainMemoryBackingModel)
VIR_ENUM_DECL(virDomainIOMMUModel)
+VIR_ENUM_DECL(virDomainShmemModel)
/* from libvirt.h */
VIR_ENUM_DECL(virDomainState)
VIR_ENUM_DECL(virDomainNostateReason)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 68d0ea973f27..a235a344d5e2 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -470,6 +470,8 @@ virDomainShmemDefFind;
virDomainShmemDefFree;
virDomainShmemDefInsert;
virDomainShmemDefRemove;
+virDomainShmemModelTypeFromString;
+virDomainShmemModelTypeToString;
virDomainShutdownReasonTypeFromString;
virDomainShutdownReasonTypeToString;
virDomainShutoffReasonTypeFromString;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index f24a98bc76fd..4e4a1c9cafe9 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8512,7 +8512,16 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager,
return -1;
}
- if (!(devstr = qemuBuildShmemDevLegacyStr(def, shmem, qemuCaps)))
+ switch ((virDomainShmemModel)shmem->model) {
+ case VIR_DOMAIN_SHMEM_MODEL_IVSHMEM:
+ devstr = qemuBuildShmemDevLegacyStr(def, shmem, qemuCaps);
+ break;
+
+ case VIR_DOMAIN_SHMEM_MODEL_LAST:
+ break;
+ }
+
+ if (!devstr)
return -1;
virCommandAddArgList(cmd, "-device", devstr, NULL);
VIR_FREE(devstr);
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-shmem.xml
b/tests/qemuxml2argvdata/qemuxml2argv-shmem.xml
index 5bc49044894c..b56e9e187895 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-shmem.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-shmem.xml
@@ -28,6 +28,7 @@
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</shmem>
<shmem name='shmem3'>
+ <model type='ivshmem'/>
<size unit='M'>512</size>
<server/>
</shmem>
@@ -41,6 +42,7 @@
<msi ioeventfd='off'/>
</shmem>
<shmem name='shmem6'>
+ <model type='ivshmem'/>
<size unit='M'>4096</size>
<server path='/tmp/shmem6-sock'/>
<msi vectors='16'/>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem.xml
b/tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem.xml
index 1197f361e3c4..5602913648bc 100644
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem.xml
@@ -22,39 +22,47 @@
<input type='keyboard' bus='ps2'/>
<memballoon model='none'/>
<shmem name='shmem0'>
+ <model type='ivshmem'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</shmem>
<shmem name='shmem1'>
+ <model type='ivshmem'/>
<size unit='M'>128</size>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</shmem>
<shmem name='shmem2'>
+ <model type='ivshmem'/>
<size unit='M'>256</size>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</shmem>
<shmem name='shmem3'>
+ <model type='ivshmem'/>
<size unit='M'>512</size>
<server/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
</shmem>
<shmem name='shmem4'>
+ <model type='ivshmem'/>
<size unit='M'>1024</size>
<server path='/tmp/shmem4-sock'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</shmem>
<shmem name='shmem5'>
+ <model type='ivshmem'/>
<size unit='M'>2048</size>
<server path='/tmp/shmem5-sock'/>
<msi ioeventfd='off'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
</shmem>
<shmem name='shmem6'>
+ <model type='ivshmem'/>
<size unit='M'>4096</size>
<server path='/tmp/shmem6-sock'/>
<msi vectors='16'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
</shmem>
<shmem name='shmem7'>
+ <model type='ivshmem'/>
<size unit='M'>8192</size>
<server path='/tmp/shmem7-sock'/>
<msi vectors='32' ioeventfd='on'/>
--
2.10.0