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)

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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'/>