提交 3cf5b6f7 编写于 作者: D Daniel P. Berrange

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
上级 5879c15d
...@@ -1154,7 +1154,8 @@ qemu-kvm -net nic,model=? /dev/null ...@@ -1154,7 +1154,8 @@ qemu-kvm -net nic,model=? /dev/null
<dt><code>model</code></dt> <dt><code>model</code></dt>
<dd> <dd>
The <code>model</code> element has a mandatory <code>type</code> 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 You can also provide the amount of video memory in kilobytes using
<code>vram</code> and the number of screen with <code>heads</code>. <code>vram</code> and the number of screen with <code>heads</code>.
</dd> </dd>
......
...@@ -1169,6 +1169,7 @@ ...@@ -1169,6 +1169,7 @@
<value>vmvga</value> <value>vmvga</value>
<value>xen</value> <value>xen</value>
<value>vbox</value> <value>vbox</value>
<value>qxl</value>
</choice> </choice>
</attribute> </attribute>
<optional> <optional>
......
...@@ -252,7 +252,8 @@ VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, ...@@ -252,7 +252,8 @@ VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
"cirrus", "cirrus",
"vmvga", "vmvga",
"xen", "xen",
"vbox") "vbox",
"qxl")
VIR_ENUM_IMPL(virDomainInput, VIR_DOMAIN_INPUT_TYPE_LAST, VIR_ENUM_IMPL(virDomainInput, VIR_DOMAIN_INPUT_TYPE_LAST,
"mouse", "mouse",
......
...@@ -482,6 +482,7 @@ enum virDomainVideoType { ...@@ -482,6 +482,7 @@ enum virDomainVideoType {
VIR_DOMAIN_VIDEO_TYPE_VMVGA, VIR_DOMAIN_VIDEO_TYPE_VMVGA,
VIR_DOMAIN_VIDEO_TYPE_XEN, VIR_DOMAIN_VIDEO_TYPE_XEN,
VIR_DOMAIN_VIDEO_TYPE_VBOX, VIR_DOMAIN_VIDEO_TYPE_VBOX,
VIR_DOMAIN_VIDEO_TYPE_QXL,
VIR_DOMAIN_VIDEO_TYPE_LAST VIR_DOMAIN_VIDEO_TYPE_LAST
}; };
......
...@@ -92,7 +92,8 @@ VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, ...@@ -92,7 +92,8 @@ VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
"cirrus", "cirrus",
"vmware", "vmware",
"", /* no arg needed for xen */ "", /* no arg needed for xen */
"" /* don't support vbox */); "", /* don't support vbox */
"", /* Not implemented QXL yet */);
int qemudLoadDriverConfig(struct qemud_driver *driver, int qemudLoadDriverConfig(struct qemud_driver *driver,
const char *filename) { const char *filename) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册