commit 96b21fb0ecf8242ceb298607da61b5718511a388
Author: Ján Tomko <jtomko@redhat.com>
Date:   Thu May 12 14:19:52 2016 +0200

    Fix tests to include video ram size
    
    My commit 3e42867 started filling out the video size in post-parse,
    but did not adjust the tests.

Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-curmem.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-curmem.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-curmem.xml
@@ -35,7 +35,7 @@
     <input type='keyboard' bus='xen'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
     <video>
-      <model type='xen' heads='1' primary='yes'/>
+      <model type='xen' vram='4096' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
@@ -51,7 +51,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5925' autoport='yes' keymap='en-us'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
@@ -44,7 +44,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
@@ -47,7 +47,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
@@ -47,7 +47,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
@@ -44,7 +44,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
@@ -45,7 +45,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
@@ -49,7 +49,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
@@ -56,7 +56,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
@@ -52,7 +52,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
@@ -52,7 +52,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
@@ -50,7 +50,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
@@ -52,7 +52,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
@@ -50,7 +50,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
@@ -50,7 +50,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
@@ -54,7 +54,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
@@ -54,7 +54,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
@@ -54,7 +54,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
@@ -52,7 +52,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
@@ -46,7 +46,7 @@
     <sound model='sb16'/>
     <sound model='es1370'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
@@ -46,7 +46,7 @@
     <sound model='sb16'/>
     <sound model='es1370'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
@@ -45,7 +45,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
@@ -45,7 +45,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
@@ -44,7 +44,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
@@ -44,7 +44,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv.xml
@@ -44,7 +44,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
@@ -49,7 +49,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
@@ -30,7 +30,7 @@
       <listen type='address' address='0.0.0.0'/>
     </graphics>
     <video>
-      <model type='xen' heads='1' primary='yes'/>
+      <model type='xen' vram='4096' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
@@ -30,7 +30,7 @@
       <listen type='address' address='0.0.0.0'/>
     </graphics>
     <video>
-      <model type='xen' heads='1' primary='yes'/>
+      <model type='xen' vram='4096' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
@@ -33,7 +33,7 @@
     <input type='keyboard' bus='xen'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
     <video>
-      <model type='xen' heads='1' primary='yes'/>
+      <model type='xen' vram='4096' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
===================================================================
--- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
@@ -48,7 +48,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-full.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-disk-positional-parms-full.xml
+++ libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-full.xml
@@ -52,7 +52,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
     </video>
   </devices>
 </domain>
Index: libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-partial.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-disk-positional-parms-partial.xml
+++ libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-partial.xml
@@ -52,7 +52,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
     </video>
   </devices>
 </domain>
Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml
+++ libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml
@@ -49,7 +49,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
     </video>
   </devices>
 </domain>
Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml
+++ libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml
@@ -49,7 +49,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
     </video>
   </devices>
 </domain>
Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
+++ libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
@@ -49,7 +49,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
     </video>
   </devices>
 </domain>
Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-multiusb.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-multiusb.xml
+++ libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-multiusb.xml
@@ -48,7 +48,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
     </video>
   </devices>
 </domain>
Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-nohap.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-nohap.xml
+++ libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-nohap.xml
@@ -56,7 +56,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
     </video>
   </devices>
 </domain>
Index: libvirt-1.3.4/tests/xlconfigdata/test-new-disk.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-new-disk.xml
+++ libvirt-1.3.4/tests/xlconfigdata/test-new-disk.xml
@@ -52,7 +52,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
     </video>
   </devices>
 </domain>
Index: libvirt-1.3.4/tests/xlconfigdata/test-rbd-multihost-noauth.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-rbd-multihost-noauth.xml
+++ libvirt-1.3.4/tests/xlconfigdata/test-rbd-multihost-noauth.xml
@@ -49,7 +49,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
     </video>
   </devices>
 </domain>
Index: libvirt-1.3.4/tests/xlconfigdata/test-spice-features.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-spice-features.xml
+++ libvirt-1.3.4/tests/xlconfigdata/test-spice-features.xml
@@ -48,7 +48,7 @@
       <clipboard copypaste='yes'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
     </video>
   </devices>
 </domain>
Index: libvirt-1.3.4/tests/xlconfigdata/test-spice.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-spice.xml
+++ libvirt-1.3.4/tests/xlconfigdata/test-spice.xml
@@ -48,7 +48,7 @@
       <clipboard copypaste='no'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
     </video>
   </devices>
 </domain>
Index: libvirt-1.3.4/tests/xlconfigdata/test-vif-rate.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-vif-rate.xml
+++ libvirt-1.3.4/tests/xlconfigdata/test-vif-rate.xml
@@ -55,7 +55,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
     </video>
   </devices>
 </domain>
Index: libvirt-1.3.4/tests/xmconfigdata/test-escape-paths.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-escape-paths.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-escape-paths.xml
@@ -54,7 +54,7 @@
     <sound model='sb16'/>
     <sound model='es1370'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-default-feature.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-default-feature.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-default-feature.xml
@@ -48,7 +48,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-force-hpet.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-force-hpet.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-force-hpet.xml
@@ -48,7 +48,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
@@ -48,7 +48,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-localtime.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-localtime.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-localtime.xml
@@ -46,7 +46,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-net-netfront.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-net-netfront.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-net-netfront.xml
@@ -46,7 +46,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
@@ -46,7 +46,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-nohap.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-nohap.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-nohap.xml
@@ -47,7 +47,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
@@ -51,7 +51,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
@@ -58,7 +58,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
@@ -54,7 +54,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-file.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-file.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-file.xml
@@ -54,7 +54,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-null.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-null.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-null.xml
@@ -52,7 +52,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
@@ -54,7 +54,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-pty.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-pty.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-pty.xml
@@ -52,7 +52,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
@@ -52,7 +52,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
@@ -56,7 +56,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
@@ -56,7 +56,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-udp.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-udp.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-udp.xml
@@ -56,7 +56,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-unix.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-unix.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-unix.xml
@@ -54,7 +54,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-sound.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-sound.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-sound.xml
@@ -48,7 +48,7 @@
     <sound model='sb16'/>
     <sound model='es1370'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-usbmouse.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-usbmouse.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-usbmouse.xml
@@ -47,7 +47,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-usbtablet.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-usbtablet.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-usbtablet.xml
@@ -47,7 +47,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-utc.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-utc.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-utc.xml
@@ -46,7 +46,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-no-source-cdrom.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-no-source-cdrom.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-no-source-cdrom.xml
@@ -49,7 +49,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-paravirt-net-e1000.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-paravirt-net-e1000.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-paravirt-net-e1000.xml
@@ -33,7 +33,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='xen' heads='1' primary='yes'/>
+      <model type='xen' vram='4096' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-paravirt-net-vifname.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-paravirt-net-vifname.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-paravirt-net-vifname.xml
@@ -34,7 +34,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='xen' heads='1' primary='yes'/>
+      <model type='xen' vram='4096' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
@@ -32,7 +32,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='xen' heads='1' primary='yes'/>
+      <model type='xen' vram='4096' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-paravirt-new-pvfb.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-paravirt-new-pvfb.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-paravirt-new-pvfb.xml
@@ -32,7 +32,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='xen' heads='1' primary='yes'/>
+      <model type='xen' vram='4096' heads='1' primary='yes'/>
     </video>
     <memballoon model='xen'/>
   </devices>
Index: libvirt-1.3.4/tests/xmconfigdata/test-pci-devs.xml
===================================================================
--- libvirt-1.3.4.orig/tests/xmconfigdata/test-pci-devs.xml
+++ libvirt-1.3.4/tests/xmconfigdata/test-pci-devs.xml
@@ -49,7 +49,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
     <video>
-      <model type='cirrus' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
     </video>
     <hostdev mode='subsystem' type='pci' managed='no'>
       <source>