summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJán Tomko <jtomko@redhat.com>2016-04-12 14:58:43 +0200
committerJán Tomko <jtomko@redhat.com>2016-04-12 14:58:43 +0200
commit4b35a7155ad6b4346591dd54f03abead2f8c6e1f (patch)
treed2027f80bc6bf3cb40c790f935c4f75fb3224205 /tests
parent4517eb0f4e844380327365f064352af87ad3e049 (diff)
downloadlibvirt-4b35a7155ad6b4346591dd54f03abead2f8c6e1f.tar.gz
tests: fix xen-related tests
My commit 6879be4 moved the addition of the implicit video device from the XML parser to the PostParse function, but did not regenerate all the tests.
Diffstat (limited to 'tests')
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-curmem.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-sound.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-utc.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv-v2.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-fv.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml3
-rw-r--r--tests/sexpr2xmldata/sexpr2xml-vif-rate.xml3
-rw-r--r--tests/xlconfigdata/test-disk-positional-parms-full.xml3
-rw-r--r--tests/xlconfigdata/test-disk-positional-parms-partial.xml3
-rw-r--r--tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml3
-rw-r--r--tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml3
-rw-r--r--tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml3
-rw-r--r--tests/xlconfigdata/test-fullvirt-multiusb.xml3
-rw-r--r--tests/xlconfigdata/test-fullvirt-nohap.xml3
-rw-r--r--tests/xlconfigdata/test-new-disk.xml3
-rw-r--r--tests/xlconfigdata/test-rbd-multihost-noauth.xml3
-rw-r--r--tests/xlconfigdata/test-spice-features.xml3
-rw-r--r--tests/xlconfigdata/test-spice.xml3
-rw-r--r--tests/xlconfigdata/test-vif-rate.xml3
-rw-r--r--tests/xmconfigdata/test-escape-paths.xml3
-rw-r--r--tests/xmconfigdata/test-fullvirt-default-feature.xml3
-rw-r--r--tests/xmconfigdata/test-fullvirt-force-hpet.xml3
-rw-r--r--tests/xmconfigdata/test-fullvirt-force-nohpet.xml3
-rw-r--r--tests/xmconfigdata/test-fullvirt-localtime.xml3
-rw-r--r--tests/xmconfigdata/test-fullvirt-net-netfront.xml3
-rw-r--r--tests/xmconfigdata/test-fullvirt-new-cdrom.xml3
-rw-r--r--tests/xmconfigdata/test-fullvirt-nohap.xml3
-rw-r--r--tests/xmconfigdata/test-fullvirt-parallel-tcp.xml3
-rw-r--r--tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml3
-rw-r--r--tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml3
-rw-r--r--tests/xmconfigdata/test-fullvirt-serial-file.xml3
-rw-r--r--tests/xmconfigdata/test-fullvirt-serial-null.xml3
-rw-r--r--tests/xmconfigdata/test-fullvirt-serial-pipe.xml3
-rw-r--r--tests/xmconfigdata/test-fullvirt-serial-pty.xml3
-rw-r--r--tests/xmconfigdata/test-fullvirt-serial-stdio.xml3
-rw-r--r--tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml3
-rw-r--r--tests/xmconfigdata/test-fullvirt-serial-tcp.xml3
-rw-r--r--tests/xmconfigdata/test-fullvirt-serial-udp.xml3
-rw-r--r--tests/xmconfigdata/test-fullvirt-serial-unix.xml3
-rw-r--r--tests/xmconfigdata/test-fullvirt-sound.xml3
-rw-r--r--tests/xmconfigdata/test-fullvirt-usbmouse.xml3
-rw-r--r--tests/xmconfigdata/test-fullvirt-usbtablet.xml3
-rw-r--r--tests/xmconfigdata/test-fullvirt-utc.xml3
-rw-r--r--tests/xmconfigdata/test-no-source-cdrom.xml3
-rw-r--r--tests/xmconfigdata/test-paravirt-net-e1000.xml3
-rw-r--r--tests/xmconfigdata/test-paravirt-net-vifname.xml3
-rw-r--r--tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml3
-rw-r--r--tests/xmconfigdata/test-paravirt-new-pvfb.xml3
-rw-r--r--tests/xmconfigdata/test-pci-devs.xml3
73 files changed, 219 insertions, 0 deletions
diff --git a/tests/sexpr2xmldata/sexpr2xml-curmem.xml b/tests/sexpr2xmldata/sexpr2xml-curmem.xml
index 4ac263ed1f..a2668d1707 100644
--- a/tests/sexpr2xmldata/sexpr2xml-curmem.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-curmem.xml
@@ -34,6 +34,9 @@
<input type='mouse' bus='xen'/>
<input type='keyboard' bus='xen'/>
<graphics type='vnc' port='-1' autoport='yes'/>
+ <video>
+ <model type='xen' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
index 17522f1cc7..c4b22f6ea4 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
@@ -50,6 +50,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5925' autoport='yes' keymap='en-us'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
index 00907fe6b3..17d401644e 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
@@ -43,6 +43,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
index 7e014dcb34..20a0d76208 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
@@ -46,6 +46,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
index 1fa8c14502..13fb299422 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
@@ -46,6 +46,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
index d82ca3869b..1380426316 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
@@ -43,6 +43,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
index d5479dc295..64111fe67f 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
@@ -44,6 +44,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
index 91afcc139d..f362aeead6 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
@@ -48,6 +48,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
index b5bdf5ce08..4d3bdde55b 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
@@ -55,6 +55,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
index aca8f154fc..d3eaf822fa 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
@@ -51,6 +51,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
index ac754a26b6..0f209d60e5 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
@@ -51,6 +51,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
index 3ed8c775d8..b157f63dda 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
@@ -49,6 +49,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
index 649b5e6e06..d9cd840720 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
@@ -51,6 +51,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
index ef844022d6..2cffa65cce 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
@@ -49,6 +49,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
index 07bd1fab7a..6e473d4b7c 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
@@ -49,6 +49,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
index cd3031b4e9..f03bd29529 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
@@ -53,6 +53,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
index ab2319659f..2e9c6296e2 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
@@ -53,6 +53,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
index fe89b9a2d2..3f3f676650 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
@@ -53,6 +53,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
index 344ea42e79..4f28511785 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
@@ -51,6 +51,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
index caa856fdbe..f934a85812 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
@@ -45,6 +45,9 @@
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
<sound model='sb16'/>
<sound model='es1370'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
index caa856fdbe..f934a85812 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
@@ -45,6 +45,9 @@
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
<sound model='sb16'/>
<sound model='es1370'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
index bf710ec24b..8b5887e74a 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
@@ -44,6 +44,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
index 8e9fd80918..3e4b366dd1 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
@@ -44,6 +44,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
index 1d819911e3..9c2b9e3277 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
@@ -43,6 +43,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
index 1d819911e3..9c2b9e3277 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
@@ -43,6 +43,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.xml b/tests/sexpr2xmldata/sexpr2xml-fv.xml
index 1d819911e3..9c2b9e3277 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv.xml
@@ -43,6 +43,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
index 310279d7fb..97d9482453 100644
--- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
@@ -48,6 +48,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
index eacfc97de4..dbdacf9e69 100644
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
@@ -29,6 +29,9 @@
<graphics type='vnc' port='5925' autoport='no' listen='0.0.0.0' keymap='ja'>
<listen type='address' address='0.0.0.0'/>
</graphics>
+ <video>
+ <model type='xen' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
index f5b80c86c4..c415aab9b1 100644
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
@@ -29,6 +29,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0' keymap='ja'>
<listen type='address' address='0.0.0.0'/>
</graphics>
+ <video>
+ <model type='xen' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
index 0aebf20503..c1acba110e 100644
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
@@ -32,6 +32,9 @@
<input type='mouse' bus='xen'/>
<input type='keyboard' bus='xen'/>
<graphics type='vnc' port='-1' autoport='yes'/>
+ <video>
+ <model type='xen' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml b/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
index 58b7dd06c6..45887e5470 100644
--- a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
@@ -47,6 +47,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xlconfigdata/test-disk-positional-parms-full.xml b/tests/xlconfigdata/test-disk-positional-parms-full.xml
index 7fd189944b..3d4868ce07 100644
--- a/tests/xlconfigdata/test-disk-positional-parms-full.xml
+++ b/tests/xlconfigdata/test-disk-positional-parms-full.xml
@@ -51,5 +51,8 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
</devices>
</domain>
diff --git a/tests/xlconfigdata/test-disk-positional-parms-partial.xml b/tests/xlconfigdata/test-disk-positional-parms-partial.xml
index 7c42736155..402f479418 100644
--- a/tests/xlconfigdata/test-disk-positional-parms-partial.xml
+++ b/tests/xlconfigdata/test-disk-positional-parms-partial.xml
@@ -51,5 +51,8 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
</devices>
</domain>
diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml
index 1a27be6747..686a409655 100644
--- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml
+++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml
@@ -48,5 +48,8 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
</devices>
</domain>
diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml
index 1a27be6747..686a409655 100644
--- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml
+++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml
@@ -48,5 +48,8 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
</devices>
</domain>
diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
index 1a27be6747..686a409655 100644
--- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
+++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
@@ -48,5 +48,8 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
</devices>
</domain>
diff --git a/tests/xlconfigdata/test-fullvirt-multiusb.xml b/tests/xlconfigdata/test-fullvirt-multiusb.xml
index 1686807d64..5ec72c4244 100644
--- a/tests/xlconfigdata/test-fullvirt-multiusb.xml
+++ b/tests/xlconfigdata/test-fullvirt-multiusb.xml
@@ -47,5 +47,8 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
</devices>
</domain>
diff --git a/tests/xlconfigdata/test-fullvirt-nohap.xml b/tests/xlconfigdata/test-fullvirt-nohap.xml
index d9dad2076e..a997c7a2ae 100644
--- a/tests/xlconfigdata/test-fullvirt-nohap.xml
+++ b/tests/xlconfigdata/test-fullvirt-nohap.xml
@@ -55,5 +55,8 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
</devices>
</domain>
diff --git a/tests/xlconfigdata/test-new-disk.xml b/tests/xlconfigdata/test-new-disk.xml
index 7fd189944b..3d4868ce07 100644
--- a/tests/xlconfigdata/test-new-disk.xml
+++ b/tests/xlconfigdata/test-new-disk.xml
@@ -51,5 +51,8 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
</devices>
</domain>
diff --git a/tests/xlconfigdata/test-rbd-multihost-noauth.xml b/tests/xlconfigdata/test-rbd-multihost-noauth.xml
index 560080fb38..f8f663ffed 100644
--- a/tests/xlconfigdata/test-rbd-multihost-noauth.xml
+++ b/tests/xlconfigdata/test-rbd-multihost-noauth.xml
@@ -48,5 +48,8 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
</devices>
</domain>
diff --git a/tests/xlconfigdata/test-spice-features.xml b/tests/xlconfigdata/test-spice-features.xml
index 0f81f3de86..f9eb857861 100644
--- a/tests/xlconfigdata/test-spice-features.xml
+++ b/tests/xlconfigdata/test-spice-features.xml
@@ -47,5 +47,8 @@
<mouse mode='client'/>
<clipboard copypaste='yes'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
</devices>
</domain>
diff --git a/tests/xlconfigdata/test-spice.xml b/tests/xlconfigdata/test-spice.xml
index e9976548ed..fc2fa3f74a 100644
--- a/tests/xlconfigdata/test-spice.xml
+++ b/tests/xlconfigdata/test-spice.xml
@@ -47,5 +47,8 @@
<mouse mode='server'/>
<clipboard copypaste='no'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
</devices>
</domain>
diff --git a/tests/xlconfigdata/test-vif-rate.xml b/tests/xlconfigdata/test-vif-rate.xml
index 2d42fa7d3e..0e13f2e051 100644
--- a/tests/xlconfigdata/test-vif-rate.xml
+++ b/tests/xlconfigdata/test-vif-rate.xml
@@ -54,5 +54,8 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-escape-paths.xml b/tests/xmconfigdata/test-escape-paths.xml
index 6aae9c7e65..6373fdf44b 100644
--- a/tests/xmconfigdata/test-escape-paths.xml
+++ b/tests/xmconfigdata/test-escape-paths.xml
@@ -53,6 +53,9 @@
</graphics>
<sound model='sb16'/>
<sound model='es1370'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-default-feature.xml b/tests/xmconfigdata/test-fullvirt-default-feature.xml
index 2eacbd967b..6f4dae6537 100644
--- a/tests/xmconfigdata/test-fullvirt-default-feature.xml
+++ b/tests/xmconfigdata/test-fullvirt-default-feature.xml
@@ -47,6 +47,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.xml b/tests/xmconfigdata/test-fullvirt-force-hpet.xml
index 2eacbd967b..6f4dae6537 100644
--- a/tests/xmconfigdata/test-fullvirt-force-hpet.xml
+++ b/tests/xmconfigdata/test-fullvirt-force-hpet.xml
@@ -47,6 +47,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
index 987096d7e2..6015405172 100644
--- a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
+++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
@@ -47,6 +47,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-localtime.xml b/tests/xmconfigdata/test-fullvirt-localtime.xml
index 29fcd56c93..5f81e25978 100644
--- a/tests/xmconfigdata/test-fullvirt-localtime.xml
+++ b/tests/xmconfigdata/test-fullvirt-localtime.xml
@@ -45,6 +45,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.xml b/tests/xmconfigdata/test-fullvirt-net-netfront.xml
index 621955d9f3..cb0615b8a9 100644
--- a/tests/xmconfigdata/test-fullvirt-net-netfront.xml
+++ b/tests/xmconfigdata/test-fullvirt-net-netfront.xml
@@ -45,6 +45,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
index bc9865b897..d29892ef96 100644
--- a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
+++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
@@ -45,6 +45,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-nohap.xml b/tests/xmconfigdata/test-fullvirt-nohap.xml
index 671c71b6c7..f38366cc5b 100644
--- a/tests/xmconfigdata/test-fullvirt-nohap.xml
+++ b/tests/xmconfigdata/test-fullvirt-nohap.xml
@@ -46,6 +46,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
index 081ad7463a..3269aee6c6 100644
--- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
+++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
@@ -50,6 +50,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
index 074cbcb63f..a20d6c8629 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
@@ -57,6 +57,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
index 88a029363b..8344da371b 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
@@ -53,6 +53,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.xml b/tests/xmconfigdata/test-fullvirt-serial-file.xml
index 7ac994fa14..b9439d773c 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-file.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-file.xml
@@ -53,6 +53,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.xml b/tests/xmconfigdata/test-fullvirt-serial-null.xml
index bc47c4b0bc..6e8196b532 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-null.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-null.xml
@@ -51,6 +51,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
index afaa64fcd2..da0c9bd0c1 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
@@ -53,6 +53,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.xml b/tests/xmconfigdata/test-fullvirt-serial-pty.xml
index ac68710cd5..acff588437 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-pty.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-pty.xml
@@ -51,6 +51,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
index cf307863ee..6909053950 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
@@ -51,6 +51,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
index 4e943c1285..a3fd449bdd 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
@@ -55,6 +55,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
index f752be8b59..9dba76d916 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
@@ -55,6 +55,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.xml b/tests/xmconfigdata/test-fullvirt-serial-udp.xml
index d70c5d881e..3577f9225d 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-udp.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-udp.xml
@@ -55,6 +55,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.xml b/tests/xmconfigdata/test-fullvirt-serial-unix.xml
index 9900179daf..919108bfe3 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-unix.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-unix.xml
@@ -53,6 +53,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-sound.xml b/tests/xmconfigdata/test-fullvirt-sound.xml
index abbe8df0b5..0e8595300f 100644
--- a/tests/xmconfigdata/test-fullvirt-sound.xml
+++ b/tests/xmconfigdata/test-fullvirt-sound.xml
@@ -47,6 +47,9 @@
</graphics>
<sound model='sb16'/>
<sound model='es1370'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.xml b/tests/xmconfigdata/test-fullvirt-usbmouse.xml
index 460ecc779f..8eb5aa5363 100644
--- a/tests/xmconfigdata/test-fullvirt-usbmouse.xml
+++ b/tests/xmconfigdata/test-fullvirt-usbmouse.xml
@@ -46,6 +46,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.xml b/tests/xmconfigdata/test-fullvirt-usbtablet.xml
index e6e807a5bc..dcdd951038 100644
--- a/tests/xmconfigdata/test-fullvirt-usbtablet.xml
+++ b/tests/xmconfigdata/test-fullvirt-usbtablet.xml
@@ -46,6 +46,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-utc.xml b/tests/xmconfigdata/test-fullvirt-utc.xml
index bc9865b897..d29892ef96 100644
--- a/tests/xmconfigdata/test-fullvirt-utc.xml
+++ b/tests/xmconfigdata/test-fullvirt-utc.xml
@@ -45,6 +45,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-no-source-cdrom.xml b/tests/xmconfigdata/test-no-source-cdrom.xml
index 760008552f..d4c2fd613b 100644
--- a/tests/xmconfigdata/test-no-source-cdrom.xml
+++ b/tests/xmconfigdata/test-no-source-cdrom.xml
@@ -48,6 +48,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-paravirt-net-e1000.xml b/tests/xmconfigdata/test-paravirt-net-e1000.xml
index 0db020f042..ad44d11c39 100644
--- a/tests/xmconfigdata/test-paravirt-net-e1000.xml
+++ b/tests/xmconfigdata/test-paravirt-net-e1000.xml
@@ -32,6 +32,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='xen' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-paravirt-net-vifname.xml b/tests/xmconfigdata/test-paravirt-net-vifname.xml
index ff17aee436..e94b6855dd 100644
--- a/tests/xmconfigdata/test-paravirt-net-vifname.xml
+++ b/tests/xmconfigdata/test-paravirt-net-vifname.xml
@@ -33,6 +33,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='xen' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
index ce7bfb92ed..3ca3023415 100644
--- a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
+++ b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
@@ -31,6 +31,9 @@
<graphics type='vnc' port='5925' autoport='no' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='xen' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb.xml b/tests/xmconfigdata/test-paravirt-new-pvfb.xml
index cba6dffb84..d97799a7c3 100644
--- a/tests/xmconfigdata/test-paravirt-new-pvfb.xml
+++ b/tests/xmconfigdata/test-paravirt-new-pvfb.xml
@@ -31,6 +31,9 @@
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
+ <video>
+ <model type='xen' heads='1' primary='yes'/>
+ </video>
<memballoon model='xen'/>
</devices>
</domain>
diff --git a/tests/xmconfigdata/test-pci-devs.xml b/tests/xmconfigdata/test-pci-devs.xml
index 74f17b0a1e..4c3f5f24c1 100644
--- a/tests/xmconfigdata/test-pci-devs.xml
+++ b/tests/xmconfigdata/test-pci-devs.xml
@@ -48,6 +48,9 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
+ <video>
+ <model type='cirrus' heads='1' primary='yes'/>
+ </video>
<hostdev mode='subsystem' type='pci' managed='no'>
<source>
<address domain='0x0001' bus='0x0c' slot='0x1b' function='0x2'/>