|
 |
9119d9 |
From 6890c1de31047886de4817e989fbfa7883818c5b Mon Sep 17 00:00:00 2001
|
|
|
9119d9 |
Message-Id: <6890c1de31047886de4817e989fbfa7883818c5b@dist-git>
|
|
|
9119d9 |
From: Michal Privoznik <mprivozn@redhat.com>
|
|
|
9119d9 |
Date: Mon, 12 Jan 2015 16:08:41 +0100
|
|
|
9119d9 |
Subject: [PATCH] qemuxml2argvtest: Fix test after change of qxl vgamem_mb
|
|
|
9119d9 |
default
|
|
|
9119d9 |
|
|
|
9119d9 |
Well, apparently it's possible for a patch to sneak in through
|
|
|
9119d9 |
review process and break 'make check'. It happened just lately
|
|
|
9119d9 |
with 0e502466acb84a which changed the default of vgamem_mb for
|
|
|
9119d9 |
qxl device. However, there were left some domain XMLs within our
|
|
|
9119d9 |
test suite relying on the old default. These should be updated to
|
|
|
9119d9 |
match the change.
|
|
|
9119d9 |
|
|
|
9119d9 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
9119d9 |
(cherry picked from commit d776e995e38ebf7be11778f29e23acd3c8f16506)
|
|
|
9119d9 |
|
|
|
9119d9 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1181052
|
|
|
9119d9 |
|
|
|
9119d9 |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
9119d9 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
9119d9 |
---
|
|
|
9119d9 |
tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args | 2 +-
|
|
|
9119d9 |
tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args | 4 ++--
|
|
|
9119d9 |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
9119d9 |
|
|
|
9119d9 |
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args
|
|
|
9119d9 |
index 5398ffe..92e343f 100644
|
|
|
9119d9 |
--- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args
|
|
|
9119d9 |
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args
|
|
|
9119d9 |
@@ -2,5 +2,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
|
|
|
9119d9 |
/usr/bin/qemu -S -M pc -m 1024 -smp 1 -nographic -nodefaults \
|
|
|
9119d9 |
-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
|
|
|
9119d9 |
-hda /var/lib/libvirt/images/QEMUGuest1 \
|
|
|
9119d9 |
--device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=8\
|
|
|
9119d9 |
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=16\
|
|
|
9119d9 |
,bus=pci.0,addr=0x2 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
|
|
|
9119d9 |
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args
|
|
|
9119d9 |
index 82aa0a9..51fc524 100644
|
|
|
9119d9 |
--- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args
|
|
|
9119d9 |
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args
|
|
|
9119d9 |
@@ -2,7 +2,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
|
|
|
9119d9 |
/usr/bin/qemu -S -M pc -m 1024 -smp 1 -nographic -nodefaults \
|
|
|
9119d9 |
-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
|
|
|
9119d9 |
-hda /var/lib/libvirt/images/QEMUGuest1 \
|
|
|
9119d9 |
--device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=8\
|
|
|
9119d9 |
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=16\
|
|
|
9119d9 |
,bus=pci.0,addr=0x2 -device qxl,id=video1,ram_size=67108864,vram_size=67108864\
|
|
|
9119d9 |
-,vgamem_mb=8,bus=pci.0,addr=0x4 \
|
|
|
9119d9 |
+,vgamem_mb=16,bus=pci.0,addr=0x4 \
|
|
|
9119d9 |
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
|
|
|
9119d9 |
--
|
|
|
9119d9 |
2.2.1
|
|
|
9119d9 |
|