video: cleanup usage of vram attribute and update documentation

The vram attribute was introduced to set the video memory but it is
usable only for few hypervisors excluding QEMU/KVM and the old XEN
driver. Only in case of QEMU the vram was used for QXL.

This patch updates the documentation to reflect current code in libvirt
and also changes the cases when we will set the default vram attribute.
It also fixes existing strange default value for VGA devices 9MB to 16MB
because the video ram should be rounded to power of two.

The change of default value could affect migrations but I found out that
QEMU always round the video ram to power of two internally so it's safe
to change the default value to the next closest power of two and also
silently correct every domain XML definition. And it's also safe because
we don't pass the value to QEMU.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1076098

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

docs/formatdomain.html.in

@@ -4679,7 +4679,7 @@ qemu-kvm -net nic,model=? /dev/null
   ...
   <devices>
     <video>
-      <model type='vga' vram='8192' heads='1'>
+      <model type='vga' vram='16384' heads='1'>
         <acceleration accel3d='yes' accel2d='yes'/>
       </model>
     </video>
@@ -4689,33 +4689,51 @@ qemu-kvm -net nic,model=? /dev/null
     <dl>
       <dt><code>video</code></dt>
       <dd>
-        The <code>video</code> element is the container for describing
+        <p>
-        video devices. For backwards compatibility, if no <code>video</code>
+          The <code>video</code> element is the container for describing
-        is set but there is a <code>graphics</code> in domain xml, then libvirt
+          video devices. For backwards compatibility, if no <code>video</code>
-        will add a default <code>video</code> according to the guest type.
+          is set but there is a <code>graphics</code> in domain xml, then
-        For a guest of type "kvm", the default <code>video</code> for it is:
+          libvirt will add a default <code>video</code> according to the guest
-        <code>type</code> with value "cirrus", <code>vram</code> with value
+          type.
-        "9216", and <code>heads</code> with value "1". By default, the first
+        </p>
-        video device in domain xml is the primary one, but the optional
+        <p>
-        attribute <code>primary</code> (<span class="since">since 1.0.2</span>)
+          For a guest of type "kvm", the default <code>video</code> is:
-        with value 'yes' can be used to mark the primary in cases of multiple
+          <code>type</code> with value "cirrus", <code>vram</code> with value
-        video device. The non-primary must be type of "qxl". The optional
+          "16384" and <code>heads</code> with value "1". By default, the first
-        attribute <code>ram</code> (<span class="since">since
+          video device in domain xml is the primary one, but the optional
-        1.0.2</span>) is allowed for "qxl" type only and specifies
+          attribute <code>primary</code> (<span class="since">since 1.0.2</span>)
-        the size of the primary bar, while <code>vram</code> specifies the
+          with value 'yes' can be used to mark the primary in cases of multiple
-        secondary bar size.  If "ram" or "vram" are not supplied a default
+          video device. The non-primary must be type of "qxl".
-        value is used.
+        </p>
       </dd>
 
       <dt><code>model</code></dt>
       <dd>
-        The <code>model</code> element has a mandatory <code>type</code>
+        <p>
-        attribute which takes the value "vga", "cirrus", "vmvga", "xen",
+          The <code>model</code> element has a mandatory <code>type</code>
-        "vbox", or "qxl" (<span class="since">since 0.8.6</span>)
+          attribute which takes the value "vga", "cirrus", "vmvga", "xen",
-        depending on the hypervisor features available.
+          "vbox", or "qxl" (<span class="since">since 0.8.6</span>) depending
-        You can also provide the amount of video memory in kibibytes
+          on the hypervisor features available.
-        (blocks of 1024 bytes) using
+        </p>
-        <code>vram</code> and the number of screen with <code>heads</code>.
+        <p>
+          You can provide the amount of video memory in kibibytes (blocks of
+          1024 bytes) using <code>vram</code>. This is supported only for guest
+          type of "libxl", "parallels", "qemu", "vbox", "vmx" and "xen". If no
+          value is provided the default is used. If the size is not a power of
+          two it will be rounded to closest one.
+        </p>
+        <p>
+          The number of screen can be set using <code>heads</code>. This is
+          supported only for guests type of "parallels", "kvm", "vbox" and "vmx".
+        </p>
+        <p>
+          For guest type of kvm the optional attribute <code>ram</code>
+          (<span class="since">since 1.0.2</span>) is allowed for "qxl" type
+          only and specifies the size of the primary bar, while the optional
+          attribute <code>vram</code> specifies the secondary bar size.
+          If "ram" or "vram" are not supplied a default value is used. The ram
+          should also be rounded to power of two as vram.
+        </p>
       </dd>
 
       <dt><code>acceleration</code></dt>

src/conf/domain_conf.c

@@ -3189,6 +3189,12 @@ virDomainDeviceDefPostParseInternal(virDomainDeviceDefPtr dev,
         }
     }
 
+    if (dev->type == VIR_DOMAIN_DEVICE_VIDEO) {
+        virDomainVideoDefPtr video = dev->data.video;
+        video->ram = VIR_ROUND_UP_POWER_OF_TWO(video->ram);
+        video->vram = VIR_ROUND_UP_POWER_OF_TWO(video->vram);
+    }
+
     return 0;
 }
 
@@ -10147,16 +10153,15 @@ virSysinfoParseXML(xmlNodePtr node,
     goto cleanup;
 }
 
-int
+unsigned int
 virDomainVideoDefaultRAM(const virDomainDef *def,
-                         int type)
+                         const virDomainVideoType type)
 {
     /* Defer setting default vram to the Xen drivers */
     if (def->virtType == VIR_DOMAIN_VIRT_XEN)
         return 0;
 
     switch (type) {
-        /* Weird, QEMU defaults to 9 MB ??! */
     case VIR_DOMAIN_VIDEO_TYPE_VGA:
     case VIR_DOMAIN_VIDEO_TYPE_CIRRUS:
     case VIR_DOMAIN_VIDEO_TYPE_VMVGA:
@@ -10165,7 +10170,7 @@ virDomainVideoDefaultRAM(const virDomainDef *def,
         else if (def->virtType == VIR_DOMAIN_VIRT_VMWARE)
             return 4 * 1024;
         else
-            return 9 * 1024;
+            return 16 * 1024;
         break;
 
     case VIR_DOMAIN_VIDEO_TYPE_XEN:
@@ -10326,7 +10331,7 @@ virDomainVideoDefParseXML(xmlNodePtr node,
     if (vram) {
         if (virStrToLong_ui(vram, NULL, 10, &def->vram) < 0) {
             virReportError(VIR_ERR_XML_ERROR,
-                           _("cannot parse video ram '%s'"), vram);
+                           _("cannot parse video vram '%s'"), vram);
             goto error;
         }
     } else {

src/conf/domain_conf.h

@@ -2628,7 +2628,8 @@ int virDomainFSIndexByName(virDomainDefPtr def, const char *name);
 virDomainFSDefPtr virDomainFSRemove(virDomainDefPtr def, size_t i);
 
 int virDomainVideoDefaultType(const virDomainDef *def);
-int virDomainVideoDefaultRAM(const virDomainDef *def, int type);
+unsigned int virDomainVideoDefaultRAM(const virDomainDef *def,
+                                      const virDomainVideoType type);
 
 int virDomainObjListNumOfDomains(virDomainObjListPtr doms,
                                  bool active,

src/qemu/qemu_command.c

@@ -4902,11 +4902,15 @@ qemuBuildDeviceVideoStr(virDomainDefPtr def,
             goto error;
         }
 
-        /* QEMU accepts bytes for ram_size. */
+        if (video->ram) {
-        virBufferAsprintf(&buf, ",ram_size=%u", video->ram * 1024);
+            /* QEMU accepts bytes for ram_size. */
+            virBufferAsprintf(&buf, ",ram_size=%u", video->ram * 1024);
+        }
 
-        /* QEMU accepts bytes for vram_size. */
+        if (video->vram) {
-        virBufferAsprintf(&buf, ",vram_size=%u", video->vram * 1024);
+            /* QEMU accepts bytes for vram_size. */
+            virBufferAsprintf(&buf, ",vram_size=%u", video->vram * 1024);
+        }
     }
 
     if (qemuBuildDeviceAddressStr(&buf, def, &video->info, qemuCaps) < 0)
@@ -9213,8 +9217,8 @@ qemuBuildCommandLine(virConnectPtr conn,
                     virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
                     const char *dev = (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QXL_VGA)
                                        ? "qxl-vga" : "qxl");
-                    int ram = def->videos[0]->ram;
+                    unsigned int ram = def->videos[0]->ram;
-                    int vram = def->videos[0]->vram;
+                    unsigned int vram = def->videos[0]->vram;
 
                     if (vram > (UINT_MAX / 1024)) {
                         virReportError(VIR_ERR_OVERFLOW,

src/xen/xen_driver.c

@@ -358,7 +358,7 @@ xenDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
         case VIR_DOMAIN_VIDEO_TYPE_VGA:
         case VIR_DOMAIN_VIDEO_TYPE_CIRRUS:
         case VIR_DOMAIN_VIDEO_TYPE_VMVGA:
-            dev->data.video->vram = 9 * 1024;
+            dev->data.video->vram = 16 * 1024;
         break;
 
         case VIR_DOMAIN_VIDEO_TYPE_XEN:

tests/qemuhotplugtestdata/qemuhotplug-console-compat-2+console-virtio.xml

@@ -91,7 +91,7 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </sound>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml

@@ -88,7 +88,7 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </sound>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2argvdata/qemuxml2argv-controller-order.xml

@@ -73,7 +73,7 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </sound>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <hostdev mode='subsystem' type='usb' managed='yes'>

tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml

@@ -28,7 +28,7 @@
       <listen type='network' network='Bobsnetwork'/>
     </graphics>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1'/>
     </video>
     <memballoon model='virtio'/>
   </devices>

tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml

@@ -28,7 +28,7 @@
       <listen type='network' network='Bobsnetwork'/>
     </graphics>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1'/>
     </video>
     <memballoon model='virtio'/>
   </devices>

tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml

@@ -27,7 +27,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='sdl' display=':0.1' xauth='/root/.Xauthority' fullscreen='yes'/>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1'/>
     </video>
     <memballoon model='none'/>
   </devices>

tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml

@@ -27,7 +27,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='sdl' display=':0.1' xauth='/root/.Xauthority'/>
     <video>
-      <model type='vga' vram='9216' heads='1'/>
+      <model type='vga' vram='16384' heads='1'/>
     </video>
     <memballoon model='none'/>
   </devices>

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.xml

@@ -32,7 +32,7 @@
       <address type='virtio-serial' controller='1' bus='0' port='3'/>
     </channel>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1'/>
     </video>
     <memballoon model='virtio'/>
   </devices>

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args

@@ -6,6 +6,6 @@ x509-dir=/etc/pki/libvirt-spice,\
 image-compression=auto_glz,jpeg-wan-compression=auto,\
 zlib-glz-wan-compression=auto,\
 playback-compression=on,streaming-video=filter -vga \
-qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368 \
+qxl -global qxl.ram_size=67108864 -global qxl.vram_size=33554432 \
 -device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml

@@ -33,7 +33,7 @@
       <streaming mode='filter'/>
     </graphics>
     <video>
-      <model type='qxl' ram='65536' vram='18432' heads='1'/>
+      <model type='qxl' ram='65536' vram='32768' heads='1'/>
     </video>
     <video>
       <model type='qxl' ram='65536' vram='32768' heads='1'/>

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args

@@ -6,4 +6,4 @@ SASL_CONF_PATH=/root/.sasl2 QEMU_AUDIO_DRV=spice \
 -spice port=5903,tls-port=5904,sasl,addr=127.0.0.1,\
 x509-dir=/etc/pki/libvirt-spice,tls-channel=default \
 -vga qxl -global qxl.ram_size=67108864 -global \
-qxl.vram_size=18874368 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+qxl.vram_size=33554432 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.xml

@@ -28,7 +28,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='qxl' ram='65536' vram='18432' heads='1'/>
+      <model type='qxl' ram='65536' vram='32768' heads='1'/>
     </video>
     <memballoon model='virtio'/>
   </devices>

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml

@@ -77,7 +77,7 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </sound>
     <video>
-      <model type='vga' vram='9216' heads='1'/>
+      <model type='vga' vram='16384' heads='1'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args

@@ -8,6 +8,6 @@ image-compression=auto_glz,jpeg-wan-compression=auto,\
 zlib-glz-wan-compression=auto,\
 playback-compression=on,streaming-video=filter,disable-copy-paste,\
 disable-agent-file-xfer -vga qxl -global qxl.ram_size=67108864 \
--global qxl.vram_size=18874368 \
+-global qxl.vram_size=33554432 \
 -device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml

@@ -37,7 +37,7 @@
       <filetransfer enable='no'/>
     </graphics>
     <video>
-      <model type='qxl' ram='65536' vram='18432' heads='1'/>
+      <model type='qxl' ram='65536' vram='32768' heads='1'/>
     </video>
     <video>
       <model type='qxl' ram='65536' vram='32768' heads='1'/>

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml

@@ -29,7 +29,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1'/>
     </video>
     <memballoon model='none'/>
   </devices>

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml

@@ -29,7 +29,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1'/>
     </video>
     <memballoon model='none'/>
   </devices>

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml

@@ -27,7 +27,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' socket='/tmp/foo.socket'/>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1'/>
     </video>
     <memballoon model='none'/>
   </devices>

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml

@@ -29,7 +29,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1'/>
     </video>
     <memballoon model='none'/>
   </devices>

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml

@@ -22,7 +22,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1'/>
     </video>
     <memballoon model='none'/>
   </devices>

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml

@@ -29,7 +29,7 @@
       <listen type='address' address='2001:1:2:3:4:5:1234:1234'/>
     </graphics>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1'/>
     </video>
     <memballoon model='none'/>
   </devices>

tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml

@@ -66,7 +66,7 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </sound>
     <video>
-      <model type='vga' vram='9216' heads='1'/>
+      <model type='vga' vram='16384' heads='1'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.xml

@@ -34,7 +34,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.xml

@@ -35,7 +35,7 @@
     <controller type='pci' index='8' model='pci-bridge'/>
     <input type='mouse' bus='ps2'/>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml

@@ -201,7 +201,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args

@@ -6,4 +6,4 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \
 -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \
 -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \
--vga qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368
+-vga qxl -global qxl.ram_size=67108864 -global qxl.vram_size=33554432

tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.xml

@@ -26,7 +26,7 @@
     <controller type='pci' index='2' model='pci-bridge'/>
     <controller type='sata' index='0'/>
     <video>
-      <model type='qxl' ram='65536' vram='18432' heads='1'/>
+      <model type='qxl' ram='65536' vram='32768' heads='1'/>
     </video>
     <memballoon model='none'/>
   </devices>

tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml

@@ -34,7 +34,7 @@
     <input type='mouse' bus='usb'/>
     <graphics type='sdl'/>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1'/>
     </video>
     <memballoon model='none'/>
   </devices>

tests/qemuxml2argvdata/qemuxml2argv-q35.args

@@ -5,4 +5,4 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \
 -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \
 -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \
--vga qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368
+-vga qxl -global qxl.ram_size=67108864 -global qxl.vram_size=33554432

tests/qemuxml2argvdata/qemuxml2argv-q35.xml

@@ -23,7 +23,7 @@
     <controller type='pci' index='1' model='dmi-to-pci-bridge'/>
     <controller type='pci' index='2' model='pci-bridge'/>
     <video>
-      <model type='qxl' ram='65536' vram='18432' heads='1'/>
+      <model type='qxl' ram='65536' vram='32768' heads='1'/>
     </video>
     <memballoon model='none'/>
   </devices>

tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args

@@ -9,5 +9,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \
 -device usb-tablet,id=input0 \
 -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice \
 -device \
-qxl-vga,id=video0,ram_size=67107840,vram_size=67107840,bus=pci.0,addr=0x2 \
+qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.xml

@@ -37,7 +37,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='qxl' ram='65535' vram='65535' heads='1'/>
+      <model type='qxl' ram='65536' vram='65536' heads='1'/>
     </video>
     <memballoon model='virtio'/>
   </devices>

tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml

@@ -29,7 +29,7 @@
       <listen type='network' network='Bobsnetwork'/>
     </graphics>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1'/>
     </video>
     <memballoon model='virtio'/>
   </devices>

tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml

@@ -80,7 +80,7 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </sound>
     <video>
-      <model type='vga' vram='9216' heads='1'/>
+      <model type='vga' vram='16384' heads='1'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-addr.xml

@@ -34,7 +34,7 @@
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-idx.xml

@@ -35,7 +35,7 @@
     <controller type='pci' index='8' model='pci-bridge'/>
     <controller type='pci' index='0' model='pci-root'/>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml

@@ -24,7 +24,7 @@
     <controller type='pci' index='2' model='pci-bridge'/>
     <controller type='sata' index='0'/>
     <video>
-      <model type='qxl' ram='65536' vram='18432' heads='1'/>
+      <model type='qxl' ram='65536' vram='32768' heads='1'/>
     </video>
     <memballoon model='none'/>
   </devices>

tests/virt-aa-helper-test

@@ -95,7 +95,7 @@ cat > "$template_xml" <<EOM
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'/>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1'/>
     </video>
   </devices>
 </domain>