* 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/formatdomain.html.in | 3 ++-
docs/schemas/domain.rng | 1 +
src/conf/domain_conf.c | 3 ++-
src/conf/domain_conf.h | 1 +
src/qemu/qemu_conf.c | 3 ++-
5 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 96de121..dcb7af8 100644
--- 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 520bdd4..16fc444 100644
--- 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 9f3c08e..7ad6901 100644
--- 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 8e32c3b..028b33a 100644
--- 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 7d2a1d6..d96ff82 100644
--- 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) {
--
1.7.2.3
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list