conf: format/parse/rng/docs for video <driver name='qemu|vhostuser'/>

Accept a new driver name attribute to specify usage of helper process, ex:

  <video>
    <driver name='vhostuser'/>
    <model type='virtio'/>
  </video>

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 86a5261e47e17d9b7b0a9500734f586921e3eca4..60a47c812bdc2b3ff41cd7079e827a354ded9edc 100644 (file)
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -6997,6 +6997,7 @@ qemu-kvm -net nic,model=? /dev/null
     <model type='vga' vram='16384' heads='1'>
       <acceleration accel3d='yes' accel2d='yes'/>
     </model>
+    <driver name='qemu'/>
   </video>
 </devices>
 ...</pre>
@@ -7097,7 +7098,16 @@ qemu-kvm -net nic,model=? /dev/null
       <dd>
         The subelement <code>driver</code> can be used to tune the device:
         <dl>
-          <dt>virtio options</dt>
+          <dt><code>name</code></dt>
+          <dd>
+            Specify the backend driver to use, either "qemu" or
+            "vhostuser" depending on the hypervisor features available
+            (<span class="since">since 5.8.0</span>).  "qemu" is the
+            default QEMU backend. "vhostuser" will use a separate
+            vhost-user process backend (for <code>virtio</code>
+            device).
+          </dd>
+        <dt>virtio options</dt>
           <dd>
           <a href="#elementsVirtio">Virtio-specific options</a> can also be
           set (<span class="since">Since 3.5.0</span>)

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index cae3be639e9dc7774f17c494df6a78a6bd1f6bcd..7006d9f50896a50c04ead6aac7bcb4588a076d38 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -3565,6 +3565,14 @@
           <optional>
             <ref name="virtioOptions"/>
           </optional>
+          <optional>
+            <attribute name="name">
+              <choice>
+                <value>qemu</value>
+                <value>vhostuser</value>
+              </choice>
+            </attribute>
+          </optional>
           <optional>
             <attribute name="vgaconf">
               <choice>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 76aaa63f57a9f175dcab5fba15d379cc5014c5b5..92f30c6f7ff36c761355695973d4385dc45549c2 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -728,6 +728,13 @@ VIR_ENUM_IMPL(virDomainPanicModel,
               "s390",
 );
 
+VIR_ENUM_IMPL(virDomainVideoBackend,
+              VIR_DOMAIN_VIDEO_BACKEND_TYPE_LAST,
+              "default",
+              "qemu",
+              "vhostuser",
+);
+
 VIR_ENUM_IMPL(virDomainVideo,
               VIR_DOMAIN_VIDEO_TYPE_LAST,
               "default",
@@ -6262,6 +6269,23 @@ virDomainVideoDefValidate(const virDomainVideoDef *video,
         }
     }
 
+    switch (video->backend) {
+    case VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER:
+        if (video->type != VIR_DOMAIN_VIDEO_TYPE_VIRTIO) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("'vhostuser' driver is only supported with 'virtio' device"));
+            return -1;
+        }
+        break;
+    case VIR_DOMAIN_VIDEO_BACKEND_TYPE_DEFAULT:
+    case VIR_DOMAIN_VIDEO_BACKEND_TYPE_QEMU:
+        break;
+    case VIR_DOMAIN_VIDEO_BACKEND_TYPE_LAST:
+    default:
+        virReportEnumRangeError(virDomainInputType, video->backend);
+        return -1;
+    }
+
     return 0;
 }
 
@@ -15405,6 +15429,7 @@ virDomainVideoDefParseXML(virDomainXMLOptionPtr xmlopt,
     xmlNodePtr cur;
     VIR_XPATH_NODE_AUTORESTORE(ctxt);
     VIR_AUTOFREE(char *) type = NULL;
+    VIR_AUTOFREE(char *) driver_name = NULL;
     VIR_AUTOFREE(char *) heads = NULL;
     VIR_AUTOFREE(char *) vram = NULL;
     VIR_AUTOFREE(char *) vram64 = NULL;
@@ -15440,6 +15465,7 @@ virDomainVideoDefParseXML(virDomainXMLOptionPtr xmlopt,
             if (virXMLNodeNameEqual(cur, "driver")) {
                 if (virDomainVirtioOptionsParseXML(cur, &def->virtio) < 0)
                     goto error;
+                driver_name = virXMLPropString(cur, "name");
             }
         }
         cur = cur->next;
@@ -15455,6 +15481,16 @@ virDomainVideoDefParseXML(virDomainXMLOptionPtr xmlopt,
         def->type = virDomainVideoDefaultType(dom);
     }
 
+    if (driver_name) {
+        if ((def->backend = virDomainVideoBackendTypeFromString(driver_name)) < 0) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           _("unknown video driver '%s'"), driver_name);
+            goto error;
+        }
+    } else {
+        def->backend = VIR_DOMAIN_VIDEO_BACKEND_TYPE_DEFAULT;
+    }
+
     if (ram) {
         if (def->type != VIR_DOMAIN_VIDEO_TYPE_QXL) {
             virReportError(VIR_ERR_XML_ERROR, "%s",
@@ -26493,13 +26529,17 @@ virDomainVideoDefFormat(virBufferPtr buf,
     virDomainVirtioOptionsFormat(&driverBuf, def->virtio);
     if (virBufferCheckError(&driverBuf) < 0)
         goto cleanup;
-    if (virBufferUse(&driverBuf) || (def->driver && def->driver->vgaconf)) {
+    if (virBufferUse(&driverBuf) || (def->driver && def->driver->vgaconf) ||
+        def->backend != VIR_DOMAIN_VIDEO_BACKEND_TYPE_DEFAULT) {
         virBufferAddLit(buf, "<driver");
         if (virBufferUse(&driverBuf))
             virBufferAddBuffer(buf, &driverBuf);
         if (def->driver && def->driver->vgaconf)
             virBufferAsprintf(buf, " vgaconf='%s'",
                               virDomainVideoVGAConfTypeToString(def->driver->vgaconf));
+        if (def->backend != VIR_DOMAIN_VIDEO_BACKEND_TYPE_DEFAULT)
+            virBufferAsprintf(buf, " name='%s'",
+                              virDomainVideoBackendTypeToString(def->backend));
         virBufferAddLit(buf, "/>\n");
     }
     virBufferAsprintf(buf, "<model type='%s'",

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 57ce5b95dc9b7e37ff5de4a718d43314eb88570a..0288795abeb22528e50a2196a53c2e403aebfa92 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1376,6 +1376,16 @@ struct _virDomainWatchdogDef {
 };
 
 
+/* the backend driver used for virtio interfaces */
+typedef enum {
+    VIR_DOMAIN_VIDEO_BACKEND_TYPE_DEFAULT,
+    VIR_DOMAIN_VIDEO_BACKEND_TYPE_QEMU,
+    VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER,
+
+    VIR_DOMAIN_VIDEO_BACKEND_TYPE_LAST
+} virDomainVideoBackendType;
+
+
 typedef enum {
     VIR_DOMAIN_VIDEO_TYPE_DEFAULT,
     VIR_DOMAIN_VIDEO_TYPE_VGA,
@@ -1426,6 +1436,7 @@ struct _virDomainVideoDef {
     virDomainVideoDriverDefPtr driver;
     virDomainDeviceInfo info;
     virDomainVirtioOptionsPtr virtio;
+    virDomainVideoBackendType backend;
 };
 
 /* graphics console modes */
@@ -3423,6 +3434,7 @@ VIR_ENUM_DECL(virDomainWatchdogModel);
 VIR_ENUM_DECL(virDomainWatchdogAction);
 VIR_ENUM_DECL(virDomainPanicModel);
 VIR_ENUM_DECL(virDomainVideo);
+VIR_ENUM_DECL(virDomainVideoBackend);
 VIR_ENUM_DECL(virDomainHostdevMode);
 VIR_ENUM_DECL(virDomainHostdevSubsys);
 VIR_ENUM_DECL(virDomainHostdevCaps);

diff --git a/tests/qemuxml2argvdata/virtio-options.xml b/tests/qemuxml2argvdata/virtio-options.xml
index 773038a320e6b6ecd6ace87680e61bae00f1d615..bdfadca22d5ed4550e72754cabacc9d805464f8b 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options.xml
+++ b/tests/qemuxml2argvdata/virtio-options.xml
@@ -73,7 +73,7 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <video>
-      <driver iommu='on' ats='on'/>
+      <driver iommu='on' ats='on' name='vhostuser'/>
       <model type='virtio' heads='1' primary='yes'>
         <acceleration accel3d='yes'/>
       </model>