[libvirt] [1/3] Add a QXL graphics card type to domain XML schema

[Daniel Veillard]

Author: Daniel P. Berrange <berrange at redhat.com>

    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/schemas/domain.rng b/docs/schemas/domain.rng
index bb6d00d..e01843b 100644
--- a/docs/schemas/domain.rng
+++ b/docs/schemas/domain.rng
@@ -880,10 +880,8 @@
     </element>
   </define>
   <!--
-     A graphic description, currently in Xen only 2 types are supported:
-       - sdl with optional display, xauth and fullscreen
-       - vnc with a required port and optional listen IP address, password
-         and keymap
+     A video adapter description, allowing configuration of device
+     model, number of virtual heads, and video ram size
    -->
   <define name="video">
     <element name="video">
@@ -896,6 +894,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 306776d..f00bbe7 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -184,7 +184,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 0b79e88..4ba8eed 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -388,6 +388,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 3d83a8f..0b91d68 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -90,7 +90,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 */
+              ""  /* XQL not implemented yet */);
 
 int qemudLoadDriverConfig(struct qemud_driver *driver,
                           const char *filename) {

-- 
Daniel Veillard      | libxml Gnome XML XSLT toolkit  http://xmlsoft.org/
daniel at veillard.com  | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library  http://libvirt.org/