Re: [libvirt] [PATCHv5 07/13] Add compatibility attribute to controllers

<controller type='scsi' index='0' model='virtio-scsi'> <driver compatibility='modern'/> </controller> https://bugzilla.redhat.com/show_bug.cgi?id=1227354 --- docs/formatdomain.html.in | 9 ++++++++- docs/schemas/domaincommon.rng | 3 +++ src/conf/domain_conf.c | 7 +++++++ src/conf/domain_conf.h | 1 + tests/qemuxml2argvdata/qemuxml2argv-virtio-revision.xml | 10 ++++++++++ tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-revision.xml | 10 ++++++++++ 6 files changed, 39 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3f06613..e208767 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3126,7 +3126,7 @@ &lt;address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/&gt; &lt;/controller&gt; &lt;controller type='scsi' index='0' model='virtio-scsi'&gt; - &lt;driver iothread='4'&gt; + &lt;driver iothread='4' compatibility='modern'&gt;

&lt;address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/&gt; &lt;/controller&gt; ... @@ -3238,6 +3238,13 @@ <code>iothread</code> value. The <code>iothread</code> value must be within the range 1 to the domain iothreads value. </dd> + <dt><code>compatibility</code></dt> + <dd> + The <code>compatibility</code> attribute can be used to specify the + compatibility of virtio devices. Allowed values are <code>legacy</code>, + <code>transitional</code> and <code>modern</code>. + <span class="since">Since 2.2.0</span>. + </dd> </dl> <p> USB companion controllers have an optional

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-revision.xml b/tests/qemuxml2argvdata/qemuxml2argv-virtio-revision.xml index c37a6c8..176a270 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-revision.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-revision.xml @@ -26,12 +26,22 @@ <target dev='vdb' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/> </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/img3'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk>

<controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </controller> + <controller type='scsi' index='0' model='virtio-scsi'> + <driver compatibility='transitional'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> + </controller> <controller type='pci' index='0' model='pci-root'/> <controller type='virtio-serial' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/>