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.

(cherry picked from commit 4b35a7155ad6b4346591dd54f03abead2f8c6e1f)

diff --git a/tests/sexpr2xmldata/sexpr2xml-curmem.xml b/tests/sexpr2xmldata/sexpr2xml-curmem.xml
index 4ac263ed1fdbc505bd3eae5a902b537a0bd9cb38..a2668d17074fdedddd4e5308828e85d105a74bf9 100644 (file)
--- 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 17522f1cc7a60f562b8091b7b53471beae2dc5fa..c4b22f6ea4c9463646f413d27cd6b4e565d32743 100644 (file)
--- 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 00907fe6b3c2e3917c8f722983effdefa4e78e13..17d401644e8b76aa9be59c9ca0c709a5a866059d 100644 (file)
--- 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 7e014dcb343dd5cef39d66bd2b05c107a5f0cefb..20a0d762082c6f4e9ff35157037794a6b8db44d4 100644 (file)
--- 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 1fa8c14502e0551e8706ee0ddde0f06459cf7756..13fb299422e49f12230e6f82183bd41d2efd34c9 100644 (file)
--- 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 d82ca3869bb2f5222ff0b4fae40b3fe82795b6f3..1380426316b6a62cb8bfa6572cb751bd24af932d 100644 (file)
--- 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 d5479dc295ae251b330dcf508b8ef27470e2c70c..64111fe67f8db774bdaae62da2275a2b0e2e7b7d 100644 (file)
--- 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 91afcc139db69a3353d3252f75ca6f4899cdd431..f362aeead644bed4ad3c4c67c0324da2ac146c83 100644 (file)
--- 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 b5bdf5ce08b4aa6c3f0cfcbbfe8223d012704c9e..4d3bdde55bb397dd54692c5672d22ece3fbd38c4 100644 (file)
--- 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 aca8f154fc21a02f82435a4c7749f470b7a075c8..d3eaf822fad288d1807f5163e0934d6bde78b5b4 100644 (file)
--- 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 ac754a26b64fe7ef19abdb5b3c2cd73b1af85887..0f209d60e5c54514acc6b0bc9501b1d7ff0ac6a8 100644 (file)
--- 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 3ed8c775d81a718203d02123be909da4ac9c19d7..b157f63dda3f48be4772f6d2c55a4030988420ac 100644 (file)
--- 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 649b5e6e06fb2d52e17a39a202afc7e84694706f..d9cd840720839855e53c376cb36b5340abfc3e8c 100644 (file)
--- 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 ef844022d65fa23ef41037e68b6b50ee751a80d3..2cffa65cced5689ca7e6697c46d01d03d4cb91ae 100644 (file)
--- 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 07bd1fab7a2dc041fe90350b96f637ea959112c7..6e473d4b7c0cd10586e05f2390cb3621cccd0841 100644 (file)
--- 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 cd3031b4e901ee1132cfa2114b0677bcabe1aa35..f03bd295293edd8578fa8b521cecfa43e765c909 100644 (file)
--- 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 ab2319659fec10c32cd77a029bf8f200fe47a026..2e9c6296e254b54af41c823b40a2a023dcead8b9 100644 (file)
--- 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 fe89b9a2d2c422f64602163d8923e940022ed9b2..3f3f676650d2a2446dd9e2d0230029397c1a475b 100644 (file)
--- 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 344ea42e797795333ebb0388690e4d08e26e3d6c..4f28511785bb98d419da0aab11d627a9c4feb8d2 100644 (file)
--- 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 caa856fdbe7df2bb102971fcb668981ab2dffded..f934a858127300d0fcd3549d10df24cc06ee074b 100644 (file)
--- 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 caa856fdbe7df2bb102971fcb668981ab2dffded..f934a858127300d0fcd3549d10df24cc06ee074b 100644 (file)
--- 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 bf710ec24ba6c2a7544d48ea86c8525f09a31f08..8b5887e74a748a4d825b08e34786fec0020630fa 100644 (file)
--- 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 8e9fd809183a4490437f34de2f0800c901bf88bb..3e4b366dd190e48c3b3ae52c9a9a82ac68b826e8 100644 (file)
--- 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 1d819911e3147f0f32d96df77d62e6d4b1a29e37..9c2b9e3277e288380b724a251e334430a859c2be 100644 (file)
--- 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 1d819911e3147f0f32d96df77d62e6d4b1a29e37..9c2b9e3277e288380b724a251e334430a859c2be 100644 (file)
--- 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 1d819911e3147f0f32d96df77d62e6d4b1a29e37..9c2b9e3277e288380b724a251e334430a859c2be 100644 (file)
--- 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 310279d7fb9892d177242a7f583a9f59157f60b2..97d94824532126891054813d5c114e346615a21c 100644 (file)
--- 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 eacfc97de418e89d17dfe02191019b3c77ff175c..dbdacf9e69269b8f69ed1c8e6eee6f826c75a251 100644 (file)
--- 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 f5b80c86c40e4b0cc9444799e3da307b3366750c..c415aab9b149a338affae2b240f9aed93e2799b0 100644 (file)
--- 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 0aebf20503f9a5b29e9e22e7e5559b46b2c96326..c1acba110ee1ede6ab6dbb50973ba8ae48372f6f 100644 (file)
--- 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 58b7dd06c671edf6ee73aef7736c6c1b2630cb1d..45887e5470a9dbbe74b2f3e6224185590925002c 100644 (file)
--- 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 7fd189944b28bbd14e5765956aa13c89c44dea50..3d4868ce079aed2206fe1b7c3cce284210b1c1e3 100644 (file)
--- 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 7c427361558e45e291e462cae1f32ee16e4167f8..402f47941844892e50eddb36e93bdfa810adca89 100644 (file)
--- 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 1a27be6747fd6db6c539b4c896a8eec6c3bc81be..686a409655829edcdc37a34eafe463e852c39ba3 100644 (file)
--- 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 1a27be6747fd6db6c539b4c896a8eec6c3bc81be..686a409655829edcdc37a34eafe463e852c39ba3 100644 (file)
--- 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 1a27be6747fd6db6c539b4c896a8eec6c3bc81be..686a409655829edcdc37a34eafe463e852c39ba3 100644 (file)
--- 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 1686807d64577a9655f19599da4c72602ce3c0ea..5ec72c4244f034080009689fe2777fffb94939ff 100644 (file)
--- 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 d9dad2076e237a168fada5f2add16a12acd91d87..a997c7a2ae8303167fbdee9ea82488e3f86c9f13 100644 (file)
--- 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 7fd189944b28bbd14e5765956aa13c89c44dea50..3d4868ce079aed2206fe1b7c3cce284210b1c1e3 100644 (file)
--- 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 560080fb38c9a5c426aa5e720c00f5a24ac6d324..f8f663ffed3cfc57cb457d66306516da94ecacd4 100644 (file)
--- 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 0f81f3de86b4ff4c1d277a2696cdcbe1bec6972c..f9eb85786150168813f5c49b51cc6bac43f5cb92 100644 (file)
--- 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 e9976548eddbccc8f82b3025949de86cccfe480e..fc2fa3f74a238d5f61fef635198b1f7be306e93a 100644 (file)
--- 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 2d42fa7d3ea978e4c514634dd5afec27adcbe324..0e13f2e0515eadf52ab867e0087b25f60b5dfafc 100644 (file)
--- 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 6aae9c7e65a1f08ab2887164e8be59980b230976..6373fdf44b318a5b6a0daed53b787f6bfd8dae7a 100644 (file)
--- 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 2eacbd967bc1b5698d45720626329c27d0a15ac3..6f4dae6537a2cb23611cbb9a5a5038d324864ebd 100644 (file)
--- 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 2eacbd967bc1b5698d45720626329c27d0a15ac3..6f4dae6537a2cb23611cbb9a5a5038d324864ebd 100644 (file)
--- 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 987096d7e25ff7679bd94f6d36619df39c1eda00..601540517217e61f214daa7bde0cbc4a5ffa2df3 100644 (file)
--- 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 29fcd56c9327cd2061b62b05129ed613ebda0157..5f81e25978482e9f0473f509335574b2017af60c 100644 (file)
--- 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 621955d9f3a60053dc088289d98c323136590ab2..cb0615b8a925e6fe54742170113609d25df0bcb7 100644 (file)
--- 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 bc9865b8979bcc5108f1bac99f73c2e0e169031d..d29892ef96e61a310927c34d82e2b2e6ad0fb16d 100644 (file)
--- 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 671c71b6c7cf3e2238c13ee49bd163729977e253..f38366cc5ba8721f98e2a623cac0cc0812424e82 100644 (file)
--- 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 081ad7463aa8d396de524ac121f51e89fe06e139..3269aee6c64f33c7bb64af1635bc92d300874946 100644 (file)
--- 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 074cbcb63f2e783b2eb7884165787ecbe889d791..a20d6c8629883b4246b2153460bb8e407cbb3d2d 100644 (file)
--- 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 88a029363b523e27b4b24e635afa3d1412ec6cf0..8344da371bea9541c01e4af459a5bb4399f22955 100644 (file)
--- 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 7ac994fa142be6dd01f2bd59edeb8bda2de97b58..b9439d773cf3de0be7e4ad2890194a548b93a3e9 100644 (file)
--- 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 bc47c4b0bc2670f409bf716fa93bc58621fc06bb..6e8196b532f8f24d24fc60c8de418d5f81343b78 100644 (file)
--- 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 afaa64fcd286b3c862e29aab06e5b6d675de83a9..da0c9bd0c19c0582c10405a5e54a17c7b236b713 100644 (file)
--- 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 ac68710cd5f93d17e140c63d01d973dbb7aa4654..acff588437aea9c3761f1ab9b567e332f018d8d9 100644 (file)
--- 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 cf307863ee617e748a302e66d9ff4b593fa8fa0b..6909053950dbf1a53abf41c4c078a2a7330ca2cf 100644 (file)
--- 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 4e943c1285ae40d2dd9ad7e6cf1e7f26adba1847..a3fd449bdd87d6fe548662323c79dc6886d562e1 100644 (file)
--- 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 f752be8b5934414388e604bfe3728d63b3beb568..9dba76d916f80380a217c3cc0fb09edd8af3b4a4 100644 (file)
--- 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 d70c5d881ec56fb7d1b703db8bdba662600e874d..3577f9225d887b7bac1a50b4a6080749e27eacaf 100644 (file)
--- 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 9900179daf0f62155cf12f7e3ed854bae0ed5627..919108bfe3e5188f7d3228fef1ab3cadcc1145f3 100644 (file)
--- 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 abbe8df0b5b4a0376a776ec861148518375ac661..0e8595300f6eca6813c0c8fcbfee19c458ec68c3 100644 (file)
--- 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 460ecc779f2a4bd664d01bd5f807627afe4459e1..8eb5aa5363e7c6de9206bb673a3f6c3978b90bac 100644 (file)
--- 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 e6e807a5bc3d7a4342aa86574a55c5f16618e97d..dcdd9510389398f903bd58faadafa111a1ee24c9 100644 (file)
--- 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 bc9865b8979bcc5108f1bac99f73c2e0e169031d..d29892ef96e61a310927c34d82e2b2e6ad0fb16d 100644 (file)
--- 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 760008552f4df59f3583ccce08c495a7dd187df1..d4c2fd613bbb6832a296b69e1516f623b95ae460 100644 (file)
--- 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 0db020f04203d823df16dcb2bc7ab5fb6a6b4934..ad44d11c39b0834a3881a93ac1a337655e13088f 100644 (file)
--- 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 ff17aee436f798d0a08ef366aaa354f47efcb6fe..e94b6855ddbc9396fbc81863212c5302776166ef 100644 (file)
--- 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 ce7bfb92ed47297f3f8e23edd2f8edc4a2017066..3ca302341552a6b930cd22ad4e1336cb3807dec3 100644 (file)
--- 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 cba6dffb84e21e829419936ee99134b53a296852..d97799a7c3755d344c567b8b3eb40fbc8fd897a8 100644 (file)
--- 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 74f17b0a1edcb0fb3773ff22f75c1c136fd2d1d9..4c3f5f24c1dcf470d77da1d2cfe688fa7c39d2b6 100644 (file)
--- 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'/>