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

[Daniel P. Berrange]

* 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
---
 docs/schemas/domain.rng |    7 +++----
 src/conf/domain_conf.c  |    3 ++-
 src/conf/domain_conf.h  |    1 +
 src/qemu/qemu_conf.c    |    3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng
index 70e98a7..f9d6d7e 100644
--- a/docs/schemas/domain.rng
+++ b/docs/schemas/domain.rng
@@ -805,10 +805,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">
@@ -821,6 +819,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 5e37d96..4930c38 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -149,7 +149,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 7c918a7..7ea1152 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -305,6 +305,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 2db38df..7ba0ac2 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -86,7 +86,8 @@ VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
               "cirrus",
               "vmware",
               NULL, /* no arg needed for xen */
-              NULL /* don't support vbox */);
+              NULL, /* don't support vbox */
+              NULL, /* Not implemented yet */);
 
 #define PROC_MOUNT_BUF_LEN 255
 
-- 
1.6.2.5