diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index e9ff73b6ee..77ccb2def6 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -6916,6 +6916,7 @@ qemu-kvm -net nic,model=? /dev/null <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> <stats period='10'/> + <driver iommu='on' ats='on'/> </memballoon> </devices> </domain> @@ -6960,6 +6961,12 @@ qemu-kvm -net nic,model=? /dev/null Since 1.1.1, requires QEMU 1.5

+
driver
+
+ For model virtio memballoon, + Virtio-specific options can also be + set. (Since 3.5.0) +

Random number generator device

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 15fd72f882..7cea0c5e8e 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3784,6 +3784,11 @@ + + + + + diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 22b8653f32..58ba1da8a5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2305,6 +2305,7 @@ void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def) return; virDomainDeviceInfoClear(&def->info); + VIR_FREE(def->virtio); VIR_FREE(def); } @@ -12997,6 +12998,9 @@ virDomainMemballoonDefParseXML(xmlNodePtr node, else if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0) goto error; + if (virDomainVirtioOptionsParseXML(ctxt, &def->virtio) < 0) + goto error; + cleanup: VIR_FREE(model); VIR_FREE(deflate); @@ -19608,6 +19612,10 @@ virDomainMemballoonDefCheckABIStability(virDomainMemballoonDefPtr src, return false; } + if (src->virtio && dst->virtio && + !virDomainVirtioOptionsCheckABIStability(src->virtio, dst->virtio)) + return false; + if (!virDomainDeviceInfoCheckABIStability(&src->info, &dst->info)) return false; @@ -22978,6 +22986,22 @@ virDomainMemballoonDefFormat(virBufferPtr buf, return -1; } + if (def->virtio) { + virBuffer driverBuf = VIR_BUFFER_INITIALIZER; + + virDomainVirtioOptionsFormat(&driverBuf, def->virtio); + + if (virBufferCheckError(&driverBuf) < 0) { + virBufferFreeAndReset(&childrenBuf); + return -1; + } + if (virBufferUse(&driverBuf)) { + virBufferAddLit(&childrenBuf, "\n"); + } + } + if (!virBufferUse(&childrenBuf)) { virBufferAddLit(buf, "/>\n"); } else { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index b3e607bfbd..b6594d3326 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1609,6 +1609,7 @@ struct _virDomainMemballoonDef { virDomainDeviceInfo info; int period; /* seconds between collections */ int autodeflate; /* enum virTristateSwitch */ + virDomainVirtioOptionsPtr virtio; }; struct _virDomainNVRAMDef { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml b/tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml index 3357bc6d1b..b16a9847fe 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml @@ -73,6 +73,7 @@
+ /dev/random