From e0bb36c4d7c60336d2aba94013c2946e1594959b Mon Sep 17 00:00:00 2001

Message-Id: <e0bb36c4d7c60336d2aba94013c2946e1594959b@dist-git>

From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>

Date: Fri, 9 Jun 2017 12:49:03 +0200

Subject: [PATCH] Add virtio-related options to controllers

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

https://bugzilla.redhat.com/show_bug.cgi?id=1283251

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

(cherry picked from commit c85217cf8a81879d065b9d13e876eec141f63f6f)

Signed-off-by: Ján Tomko <jtomko@redhat.com>

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

---

 docs/formatdomain.html.in                              |  6 ++++++

 docs/schemas/domaincommon.rng                          |  1 +

 src/conf/domain_conf.c                                 | 10 ++++++++++

 src/conf/domain_conf.h                                 |  1 +

 tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml |  2 ++

 5 files changed, 20 insertions(+)

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in

index bb7a85a1a1..2b26f090cd 100644

--- a/docs/formatdomain.html.in

+++ b/docs/formatdomain.html.in

@@ -3597,6 +3597,12 @@

         iothread value. The iothread value

         must be within the range 1 to the domain iothreads value.

+      
virtio options

+      

+        For virtio controllers,

+        Virtio-specific options can also be

+        set. (Since 3.5.0)

+      

       USB companion controllers have an optional

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng

index f838dc55fd..2108d23df7 100644

--- a/docs/schemas/domaincommon.rng

+++ b/docs/schemas/domaincommon.rng

@@ -2019,6 +2019,7 @@

             <optional>

               <ref name="driverIOThread"/>

             </optional>

+            <ref name="virtioOptions"/>

           </element>

         </optional>

       </interleave>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c

index a4b4f70855..2e5eeb1172 100644

--- a/src/conf/domain_conf.c

+++ b/src/conf/domain_conf.c

@@ -1873,6 +1873,7 @@ void virDomainControllerDefFree(virDomainControllerDefPtr def)

         return;

     virDomainDeviceInfoClear(&def->info);

+    VIR_FREE(def->virtio);

     VIR_FREE(def);

 }

@@ -9037,6 +9038,9 @@ virDomainControllerDefParseXML(xmlNodePtr node,

         cur = cur->next;

     }

+    if (virDomainVirtioOptionsParseXML(ctxt, &def->virtio) < 0)

+        goto error;

+

     /* node is parsed differently from target attributes because

      * someone thought it should be a subelement instead...

      */

@@ -19214,6 +19218,10 @@ virDomainControllerDefCheckABIStability(virDomainControllerDefPtr src,

         }

     }

+    if (src->virtio && dst->virtio &&

+        !virDomainVirtioOptionsCheckABIStability(src->virtio, dst->virtio))

+        return false;

+

     if (!virDomainDeviceInfoCheckABIStability(&src->info, &dst->info))

         return false;

@@ -21504,6 +21512,8 @@ virDomainControllerDriverFormat(virBufferPtr buf,

     if (def->iothread)

         virBufferAsprintf(&driverBuf, " iothread='%u'", def->iothread);

+    virDomainVirtioOptionsFormat(&driverBuf, def->virtio);

+

     if (virBufferUse(&driverBuf)) {

         virBufferAddLit(buf, "

         virBufferAddBuffer(buf, &driverBuf);

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h

index eac1919175..205c9e27b1 100644

--- a/src/conf/domain_conf.h

+++ b/src/conf/domain_conf.h

@@ -813,6 +813,7 @@ struct _virDomainControllerDef {

         virDomainUSBControllerOpts usbopts;

     } opts;

     virDomainDeviceInfo info;

+    virDomainVirtioOptionsPtr virtio;

 };

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml b/tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml

index 6dd82de648..867e56c107 100644

--- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml

+++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml

@@ -27,10 +27,12 @@

       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>

     </controller>

     <controller type='scsi' index='0' model='virtio-scsi'>

+      <driver iommu='on' ats='on'/>

       <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'>

+      <driver iommu='on' ats='on'/>

       <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/>

     </controller>

     <filesystem type='mount' accessmode='passthrough'>

-- 

2.13.1