Add a QXL graphics card type to domain XML schema

* src/qemu_conf.c: Add dummy entry in enumeration
* docs/schemas/domain.rng: Add 'qxl' as a type for the <video> tag
* src/domain_conf.c, src/domain_conf.h: Add QXL to video type
  enumerations

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 96de12147a9cf34dc9487e29ab366c3d5a4fbc93..dcb7af887e2118e74c6406b26fee9a400c1cfcec 100644 (file)
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1154,7 +1154,8 @@ qemu-kvm -net nic,model=? /dev/null
       <dt><code>model</code></dt>
       <dd>
         The <code>model</code> element has a mandatory <code>type</code>
-        attribute which takes the value "vga", "cirrus", "vmvga", "xen" or "vbox".
+        attribute which takes the value "vga", "cirrus", "vmvga", "qxl",
+       "xen" or "vbox", depending on the hypervisor features available.
         You can also provide the amount of video memory in kilobytes using
         <code>vram</code> and the number of screen with <code>heads</code>.
       </dd>

diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng
index 520bdd4675e6829a42e26de125bcd7b08e980c35..16fc444df7f7281e4848c404c139fe87dd31cb9a 100644 (file)
--- a/docs/schemas/domain.rng
+++ b/docs/schemas/domain.rng
@@ -1169,6 +1169,7 @@
               <value>vmvga</value>
               <value>xen</value>
               <value>vbox</value>
+              <value>qxl</value>
             </choice>
           </attribute>
           <optional>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 7eb8fb33242e96cd66f3df7055f8b36a137fb335..09f415b711becdcdebe8259e41d94272a4e1f277 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -252,7 +252,8 @@ VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
               "cirrus",
               "vmvga",
               "xen",
-              "vbox")
+              "vbox",
+              "qxl")
 
 VIR_ENUM_IMPL(virDomainInput, VIR_DOMAIN_INPUT_TYPE_LAST,
               "mouse",

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 5827ffbe6f9a918c75ffc2d59bdb03409a27c97c..834eafeb23bcba56bf6396c589a904e09550f111 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -482,6 +482,7 @@ enum virDomainVideoType {
     VIR_DOMAIN_VIDEO_TYPE_VMVGA,
     VIR_DOMAIN_VIDEO_TYPE_XEN,
     VIR_DOMAIN_VIDEO_TYPE_VBOX,
+    VIR_DOMAIN_VIDEO_TYPE_QXL,
 
     VIR_DOMAIN_VIDEO_TYPE_LAST
 };

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index a506064012516cf4741c0fadcb283c9f92c90468..e0064f75e1d3689d8e368b0b54bdc0c5359ab776 100644 (file)
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -92,7 +92,8 @@ VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
               "cirrus",
               "vmware",
               "", /* no arg needed for xen */
-              "" /* don't support vbox */);
+              "", /* don't support vbox */
+              "", /* Not implemented QXL yet */);
 
 int qemudLoadDriverConfig(struct qemud_driver *driver,
                           const char *filename) {