]> xenbits.xensource.com Git - libvirt.git/commitdiff
video: cleanup usage of vram attribute and update documentation
authorPavel Hrdina <phrdina@redhat.com>
Mon, 24 Nov 2014 10:58:53 +0000 (11:58 +0100)
committerPavel Hrdina <phrdina@redhat.com>
Mon, 24 Nov 2014 21:05:55 +0000 (22:05 +0100)
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>
43 files changed:
docs/formatdomain.html.in
src/conf/domain_conf.c
src/conf/domain_conf.h
src/qemu/qemu_command.c
src/xen/xen_driver.c
tests/qemuhotplugtestdata/qemuhotplug-console-compat-2+console-virtio.xml
tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml
tests/qemuxml2argvdata/qemuxml2argv-controller-order.xml
tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml
tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml
tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml
tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.xml
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.xml
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml
tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml
tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.xml
tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.xml
tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml
tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args
tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.xml
tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml
tests/qemuxml2argvdata/qemuxml2argv-q35.args
tests/qemuxml2argvdata/qemuxml2argv-q35.xml
tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args
tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.xml
tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml
tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml
tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-addr.xml
tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-idx.xml
tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml
tests/virt-aa-helper-test

index 48b1a7f5347bd29fba55c42fdf9f5d0ee8672112..1a7eeaefbef9b53823c9d63193dbea96110c64fa 100644 (file)
@@ -4679,7 +4679,7 @@ qemu-kvm -net nic,model=? /dev/null
   ...
   &lt;devices&gt;
     &lt;video&gt;
-      &lt;model type='vga' vram='8192' heads='1'&gt;
+      &lt;model type='vga' vram='16384' heads='1'&gt;
         &lt;acceleration accel3d='yes' accel2d='yes'/&gt;
       &lt;/model&gt;
     &lt;/video&gt;
@@ -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
-        video devices. For backwards compatibility, if no <code>video</code>
-        is set but there is a <code>graphics</code> in domain xml, then libvirt
-        will add a default <code>video</code> according to the guest type.
-        For a guest of type "kvm", the default <code>video</code> for it is:
-        <code>type</code> with value "cirrus", <code>vram</code> with value
-        "9216", and <code>heads</code> with value "1". By default, the first
-        video device in domain xml is the primary one, but the optional
-        attribute <code>primary</code> (<span class="since">since 1.0.2</span>)
-        with value 'yes' can be used to mark the primary in cases of multiple
-        video device. The non-primary must be type of "qxl". 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 <code>vram</code> specifies the
-        secondary bar size.  If "ram" or "vram" are not supplied a default
-        value is used.
+        <p>
+          The <code>video</code> element is the container for describing
+          video devices. For backwards compatibility, if no <code>video</code>
+          is set but there is a <code>graphics</code> in domain xml, then
+          libvirt will add a default <code>video</code> according to the guest
+          type.
+        </p>
+        <p>
+          For a guest of type "kvm", the default <code>video</code> is:
+          <code>type</code> with value "cirrus", <code>vram</code> with value
+          "16384" and <code>heads</code> with value "1". By default, the first
+          video device in domain xml is the primary one, but the optional
+          attribute <code>primary</code> (<span class="since">since 1.0.2</span>)
+          with value 'yes' can be used to mark the primary in cases of multiple
+          video device. The non-primary must be type of "qxl".
+        </p>
       </dd>
 
       <dt><code>model</code></dt>
       <dd>
-        The <code>model</code> element has a mandatory <code>type</code>
-        attribute which takes the value "vga", "cirrus", "vmvga", "xen",
-        "vbox", or "qxl" (<span class="since">since 0.8.6</span>)
-        depending on the hypervisor features available.
-        You can also provide the amount of video memory in kibibytes
-        (blocks of 1024 bytes) using
-        <code>vram</code> and the number of screen with <code>heads</code>.
+        <p>
+          The <code>model</code> element has a mandatory <code>type</code>
+          attribute which takes the value "vga", "cirrus", "vmvga", "xen",
+          "vbox", or "qxl" (<span class="since">since 0.8.6</span>) depending
+          on the hypervisor features available.
+        </p>
+        <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>
index 68eef5446e4ddb1c9bfde5c0695f1a2957c4356d..f187ee78d22691ae24c21d58625ce16c9c0285b0 100644 (file)
@@ -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 {
index 0a609df3c4cfeddb117bbe90052d7278029c62ea..ffe1be657016323027258628c251f337df50a90c 100644 (file)
@@ -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,
index cbdef9c36e7ed22368ba3ef64a7f62a3f57a07de..8c89b0cf3ffc0eda366e60bdf3b7562e6f233776 100644 (file)
@@ -4902,11 +4902,15 @@ qemuBuildDeviceVideoStr(virDomainDefPtr def,
             goto error;
         }
 
-        /* QEMU accepts bytes for ram_size. */
-        virBufferAsprintf(&buf, ",ram_size=%u", video->ram * 1024);
+        if (video->ram) {
+            /* QEMU accepts bytes for ram_size. */
+            virBufferAsprintf(&buf, ",ram_size=%u", video->ram * 1024);
+        }
 
-        /* QEMU accepts bytes for vram_size. */
-        virBufferAsprintf(&buf, ",vram_size=%u", video->vram * 1024);
+        if (video->vram) {
+            /* 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;
-                    int vram = def->videos[0]->vram;
+                    unsigned int ram = def->videos[0]->ram;
+                    unsigned int vram = def->videos[0]->vram;
 
                     if (vram > (UINT_MAX / 1024)) {
                         virReportError(VIR_ERR_OVERFLOW,
index 7334142eebf1b5511c60ca9b5d36d5cf494ffe99..c9f4159ea49a838152ea9a5872981b1540ba3a9f 100644 (file)
@@ -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:
index ec1c6e8f7efbc508823ca3ee70d953f6cf84b770..d8486777207d6bb44e1daa90141fb9b87b5bfeb9 100644 (file)
@@ -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'>
index 4d4ac4706c35749ef854b591a09e0147589e19d6..a7209b2ed56b8a15e20bbb819fea1037f11e76df 100644 (file)
@@ -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'>
index 6a98eaafe00ecb3b2917bac2ee176b4513e858b1..07db77ea7f05e7f35a057dab5e0d941a42d9de1d 100644 (file)
@@ -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'>
index 98b7d6a9bb335c1188a3fb09f7c6c8630ea0cf2d..bf78ca8fd9791a032556c374354bcff228182565 100644 (file)
@@ -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>
index aa458d7a4757545fd7c0a4151b16926dccd2f2fa..62353e90e558b794437b1f67373b15b3b27a9c20 100644 (file)
@@ -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>
index 01776546fcf549d986fbaf3413d0ec9d7d8e416e..1bac0b5442ee74dd83d3c9a11b11363acf0fcf71 100644 (file)
@@ -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>
index 6bebd10cf29974fe9046adf42a24539b258da17e..5f94052353fff16bc7099b828180f066b8078723 100644 (file)
@@ -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>
index 113a236c42d0042406657604635c3a20b7416918..6a29f37892b32f9ace3a4cfb58504e960c32ec25 100644 (file)
@@ -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>
index 59f064b00eca2f5d8572012c1b2b5c0816df8fbe..cdc916c46545bff16ffb31c94d656045b9715764 100644 (file)
@@ -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
index 6c913b429440fa5e50d8305bb8bb009471a5dbb6..5c9683f9cb69c3f6982efd544da7a1a8198a2671 100644 (file)
@@ -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'/>
index 8847bcef9ac76bb3b70d5dbac75a51e809631344..0c9df167816bd65b33bee57f103a34de75bfd26d 100644 (file)
@@ -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
index eb630fa545b06e4d5a0a108340211d7a5925d2ec..d86cd56110f29b661033db68a5d49ea7141d15f8 100644 (file)
@@ -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>
index 3ed864c93b4f836866c59e5fb6d63fcfd819c1fe..bfb189cd999445293cb298ffaaeb4bc249b06d71 100644 (file)
@@ -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'>
index 8430d9c51b779edbabcb705c0e3b9476236c5ff4..704cec75a5e670da7b9704c47465c0cf1c938c63 100644 (file)
@@ -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
index 8f5814902759f74f0bfbd4d32f450c3d13d508cb..335ce69c523fdd22740f573e69680b9c495d7fdc 100644 (file)
@@ -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'/>
index 694343f62b4683ad0b8badff216cb8fbebd5acfd..f78ff48554569938929397f36442f03165051d57 100644 (file)
@@ -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>
index b35c2bddd294389179afb8b8b6baa111a2cc5ab2..e35014280584f8c1e2edfd6ad683919df1dabdb3 100644 (file)
@@ -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>
index 44df2261646c30408145e103e95f5831a1d86815..de70bc4835cb7a81fcdb2d18665b452002a119a0 100644 (file)
@@ -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>
index b35c2bddd294389179afb8b8b6baa111a2cc5ab2..e35014280584f8c1e2edfd6ad683919df1dabdb3 100644 (file)
@@ -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>
index cfa61be7045d560df9ec9b50189eab01ddc1260f..afa4b5a76b374100ab75d4d201303267de99d412 100644 (file)
@@ -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>
index 356ac360058070eda74d581b993d60d67e40377d..331346908a38f7d786ca909946d4a990cb50ee43 100644 (file)
@@ -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>
index f70e20a5ff10e87bd6759e2d1f5ec1588a241e3b..daecc8baa878957925875eb4651c17e3572be02c 100644 (file)
@@ -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'>
index 92db5e637c46a42bfe0ba70b46403e5d99212f00..f8b0fc7cab02c772831b17f12fa26ec84c83b786 100644 (file)
@@ -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'>
index f6a3ddffc3eea615e98f7eabc79056d0ba0627b0..db2fee9cc4a0e75c0bc9ad5a6230c5f034d86e79 100644 (file)
@@ -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'>
index a1cb38ce2532392069ebb91e4b47a4f5935e314e..683c2699b328da88667e83ec0cd0c6c7a6e8f119 100644 (file)
       <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'>
index 6855cd262cb4ff3e2a59f24d2c4918bc7e85b402..c8045a49794ab38f2d6ce46d731f0c3e4d87f5cb 100644 (file)
@@ -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
index ee151be96dafb11db28960a9db1af2c3ee7b2b5a..168b2701bb017967de71a6514dc8338ec2dbcb1c 100644 (file)
@@ -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>
index 1f896f8e2f7d069b6b3153c8a5611e004b9b4c50..d9ae4af9d43e0764ef9b4c006ee55a67046cc534 100644 (file)
@@ -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>
index 8cc5874c430a7db4e513e771bdaaf1574bf6e11a..08bd96e61fd1c29a07a401680699bdd4f7a1fe2c 100644 (file)
@@ -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
index edaf6cbbf03dad394fa236c32dff530a46911656..02df713771f5ab391d3574e8a9aa74c2059327ce 100644 (file)
@@ -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>
index 8c631b13b58e9f910bd3f57beb64b765460848ad..a806d63cbc620c5ed43e16684733fce0ab92729b 100644 (file)
@@ -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
index 36af468eb6593a9c160061914fe92febcf543393..905924eaae28c40c71d7bc70dfbd10fec167a443 100644 (file)
@@ -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>
index ae4080515cb08b12733052c253048d7f111f23f4..abee7b6d5b02e7777f1f615747515bbfbe557d83 100644 (file)
@@ -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>
index 73ebcab9e3e1c5160e5ef34050f37601415331ac..4f4f47cad528c3064786957493db5ca8bd5de974 100644 (file)
@@ -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'>
index 13f0f5d6b3190e21ded64affd3419e344af6adec..b65d86f7aa609ec1ea212b0c9c9af795170b9f4a 100644 (file)
@@ -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'>
index 8748437484caa2f2fb1a909db2db7478dc1b0338..b8658d1bab2a1ddb6ce22ed57f2d3f95ca428c9e 100644 (file)
@@ -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'>
index 96f8eafdce24ab79f0bb94d83441fb4910379558..752c7d504a89de8287ce1422eb771ade370e6594 100644 (file)
@@ -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>
index 4b927c176a449f0e311d2fe6e5e0bd9d51ba8403..96471ff3fc78cd628e8a4bae1dda08cec41bd5d0 100755 (executable)
@@ -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>