NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2026-09-03 20:53:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

qemu-command: introduce new vgamem attribute for QXL video device

Browse Source 
Add attribute to set vgamem_mb parameter of QXL device for QEMU. This
value sets the size of VGA framebuffer for QXL device. Default value in
QEMU is 8MB so reuse it also in libvirt to not break things.

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

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina
2014-11-24 22:20:13 +01:00
parent 24c6ca860e
commit 742d49fa17
16 changed files with 94 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml
+2 -2
View File
@@ -33,10 +33,10 @@
<streaming mode='filter'/>
</graphics>
<video>
<model type='qxl' ram='65536' vram='32768' heads='1'/>
<model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/>
</video>
<video>
<model type='qxl' ram='65536' vram='32768' heads='1'/>
<model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml
+2 -2
View File
@@ -30,10 +30,10 @@
<channel name='inputs' mode='insecure'/>
</graphics>
<video>
<model type='qxl' ram='65536' vram='32768' heads='1'/>
<model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/>
</video>
<video>
<model type='qxl' ram='65536' vram='65536' heads='1'/>
<model type='qxl' ram='65536' vram='65536' vgamem='8192' heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml
+2 -2
View File
@@ -37,10 +37,10 @@
<filetransfer enable='no'/>
</graphics>
<video>
<model type='qxl' ram='65536' vram='32768' heads='1'/>
<model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/>
</video>
<video>
<model type='qxl' ram='65536' vram='32768' heads='1'/>
<model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.xml
+1 -1
View 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='32768' heads='1'/>
<model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/>
</video>
<memballoon model='none'/>
</devices>
tests/qemuxml2argvdata/qemuxml2argv-q35.xml
+1 -1
View 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='32768' heads='1'/>
<model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/>
</video>
<memballoon model='none'/>
</devices>
tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.xml
+1 -1
View File
@@ -37,7 +37,7 @@
<listen type='address' address='127.0.0.1'/>
</graphics>
<video>
<model type='qxl' ram='65536' vram='65536' heads='1'/>
<model type='qxl' ram='65536' vram='65536' vgamem='8192' heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args
+2 -2
View File
@@ -2,5 +2,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
/usr/bin/qemu -S -M pc -m 1024 -smp 1 -nographic -nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
-hda /var/lib/libvirt/images/QEMUGuest1 \
-device 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
-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=8\
,bus=pci.0,addr=0x2 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args
+3 -3
View File
@@ -2,7 +2,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
/usr/bin/qemu -S -M pc -m 1024 -smp 1 -nographic -nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
-hda /var/lib/libvirt/images/QEMUGuest1 \
-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0\
,addr=0x2 -device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0\
,addr=0x4 \
-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=8\
,bus=pci.0,addr=0x2 -device qxl,id=video1,ram_size=67108864,vram_size=67108864\
,vgamem_mb=8,bus=pci.0,addr=0x4 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
tests/qemuxml2argvtest.c
+4 -2
View File
@@ -1362,13 +1362,15 @@ mymain(void)
DO_TEST("video-qxl-device", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_QXL_VGA,
QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
DO_TEST("video-qxl-device-vgamem", QEMU_CAPS_DEVICE,
QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_QXL_VGA_VGAMEM);
DO_TEST_FAILURE("video-qxl-sec-nodevice", QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL);
DO_TEST("video-qxl-sec-device", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_QXL_VGA,
QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
DO_TEST("video-qxl-sec-device-vgamem", QEMU_CAPS_DEVICE,
QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL,
QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_QXL_VGA_VGAMEM,
QEMU_CAPS_QXL_VGAMEM);
DO_TEST("virtio-rng-default", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_VIRTIO_RNG,
QEMU_CAPS_OBJECT_RNG_RANDOM);
tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml
+1 -1
View 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='32768' heads='1'/>
<model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/>
</video>
<memballoon model='none'/>
</devices>