6:36 a.m.
https://bugzilla.redhat.com/show_bug.cgi?id=1283251
---
docs/formatdomain.html.in | 5 +++++
docs/schemas/domaincommon.rng | 1 +
src/conf/domain_conf.c | 9 +++++++++
src/conf/domain_conf.h | 1 +
tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml | 4 ++--
tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml | 4 ++--
6 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index c286f50..6852f49 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -3011,6 +3011,11 @@
<code>bus</code> and "pci" or "ccw"
<code>address</code> types.
<span class='since'>Since 1.2.8 (QEMU 2.1)</span>
</li>
+ <li>
+ For virtio disks,
+ <a href="#elementsVirtio">Virtio-specific options</a> can
also be
+ set. (<span class="since">Since 3.5.0</span>)
+ </li>
</ul>
</dd>
<dt><code>backenddomain</code></dt>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 5b424c7..a77a04f 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1770,6 +1770,7 @@
<optional>
<ref name="detect_zeroes"/>
</optional>
+ <ref name="virtioOptions"/>
<empty/>
</element>
</define>
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 7744563..92bd1da 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1731,6 +1731,7 @@ virDomainDiskDefFree(virDomainDiskDefPtr def)
VIR_FREE(def->product);
VIR_FREE(def->domain_name);
VIR_FREE(def->blkdeviotune.group_name);
+ VIR_FREE(def->virtio);
virDomainDeviceInfoClear(&def->info);
virObjectUnref(def->privateData);
@@ -8404,6 +8405,9 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
}
}
+ if (virDomainVirtioOptionsParseXML(ctxt, &def->virtio) < 0)
+ goto error;
+
/* Disk volume types will have authentication information handled in
* virStorageTranslateDiskSourcePool
*/
@@ -21285,6 +21289,11 @@ virDomainDiskDefFormat(virBufferPtr buf,
virBufferAsprintf(&driverBuf, " iothread='%u'",
def->iothread);
if (def->detect_zeroes)
virBufferAsprintf(&driverBuf, " detect_zeroes='%s'",
detect_zeroes);
+
+ virBufferAddLit(&driverBuf, " ");
+ virDomainVirtioOptionsFormat(&driverBuf, def->virtio);
+ virBufferTrim(&driverBuf, " ", -1);
+
if (virBufferUse(&driverBuf)) {
virBufferAddLit(buf, "<driver");
virBufferAddBuffer(buf, &driverBuf);
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index a3bb2cf..b43ff3e 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -675,6 +675,7 @@ struct _virDomainDiskDef {
unsigned int iothread; /* unused = 0, > 0 specific thread # */
int detect_zeroes; /* enum virDomainDiskDetectZeroes */
char *domain_name; /* backend domain name */
+ virDomainVirtioOptionsPtr virtio;
};
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml
b/tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml
index 96ec700..25a524a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml
@@ -15,13 +15,13 @@
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
- <driver name='qemu' type='raw'/>
+ <driver name='qemu' type='raw' iommu_platform='on'
ats='on'/>
<source file='/var/lib/libvirt/images/img1'/>
<target dev='vda' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x0a' function='0x0'/>
</disk>
<disk type='file' device='disk'>
- <driver name='qemu' type='raw'/>
+ <driver name='qemu' type='raw' iommu_platform='off'
ats='off'/>
<source file='/var/lib/libvirt/images/img2'/>
<target dev='vdb' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x0b' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml
b/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml
index 96ec700..25a524a 100644
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml
@@ -15,13 +15,13 @@
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
- <driver name='qemu' type='raw'/>
+ <driver name='qemu' type='raw' iommu_platform='on'
ats='on'/>
<source file='/var/lib/libvirt/images/img1'/>
<target dev='vda' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x0a' function='0x0'/>
</disk>
<disk type='file' device='disk'>
- <driver name='qemu' type='raw'/>
+ <driver name='qemu' type='raw' iommu_platform='off'
ats='off'/>
<source file='/var/lib/libvirt/images/img2'/>
<target dev='vdb' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x0b' function='0x0'/>
--
2.10.2