|
 |
e2df08 |
From 5201a8edf521930ba8ed3cc8c901f12d80658e1b Mon Sep 17 00:00:00 2001
|
|
|
e2df08 |
From: Giuseppe Scrivano <gscrivan@redhat.com>
|
|
|
e2df08 |
Date: Tue, 25 Nov 2014 10:35:43 +0100
|
|
|
e2df08 |
Subject: [PATCH 2/2] tests: fix failures with newer libvirt version
|
|
|
e2df08 |
|
|
|
e2df08 |
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
|
|
|
e2df08 |
(cherry picked from commit 9d633879b1b11bc151fb64a0782c0c35c524ad18)
|
|
|
e2df08 |
---
|
|
|
e2df08 |
tests/cli-test-xml/compare/virt-xml-edit-neg-num.xml | 6 +++---
|
|
|
e2df08 |
tests/cli-test-xml/compare/virt-xml-edit-pos-num.xml | 2 +-
|
|
|
e2df08 |
tests/cli-test-xml/compare/virt-xml-edit-select-sound-model.xml | 2 +-
|
|
|
e2df08 |
tests/cli-test-xml/compare/virt-xml-edit-simple-video.xml | 6 +++---
|
|
|
e2df08 |
tests/cli-test-xml/compare/virt-xml-remove-sound-model.xml | 2 +-
|
|
|
e2df08 |
tests/cli-test-xml/compare/virt-xml-remove-video-all.xml | 4 ++--
|
|
|
e2df08 |
6 files changed, 11 insertions(+), 11 deletions(-)
|
|
|
e2df08 |
|
|
|
e2df08 |
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-neg-num.xml b/tests/cli-test-xml/compare/virt-xml-edit-neg-num.xml
|
|
|
e2df08 |
index 044862d..6b84355 100644
|
|
|
e2df08 |
--- a/tests/cli-test-xml/compare/virt-xml-edit-neg-num.xml
|
|
|
e2df08 |
+++ b/tests/cli-test-xml/compare/virt-xml-edit-neg-num.xml
|
|
|
e2df08 |
@@ -1,8 +1,8 @@
|
|
|
e2df08 |
- <model type="vmvga" vram="9216" heads="1"/>
|
|
|
e2df08 |
+ <model type="vmvga" vram="16384" heads="1"/>
|
|
|
e2df08 |
</video>
|
|
|
e2df08 |
<video>
|
|
|
e2df08 |
-- <model type="cirrus" vram="10240" heads="3"/>
|
|
|
e2df08 |
-+ <model type="qxl" vram="10240" heads="3"/>
|
|
|
e2df08 |
+- <model type="cirrus" vram="16384" heads="3"/>
|
|
|
e2df08 |
++ <model type="qxl" vram="16384" heads="3"/>
|
|
|
e2df08 |
</video>
|
|
|
e2df08 |
<hostdev mode="subsystem" type="usb" managed="yes">
|
|
|
e2df08 |
<source>
|
|
|
e2df08 |
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-pos-num.xml b/tests/cli-test-xml/compare/virt-xml-edit-pos-num.xml
|
|
|
e2df08 |
index ce048b5..d5e15bf 100644
|
|
|
e2df08 |
--- a/tests/cli-test-xml/compare/virt-xml-edit-pos-num.xml
|
|
|
e2df08 |
+++ b/tests/cli-test-xml/compare/virt-xml-edit-pos-num.xml
|
|
|
e2df08 |
@@ -4,7 +4,7 @@
|
|
|
e2df08 |
- <sound model="ich6"/>
|
|
|
e2df08 |
+ <sound model="pcspk"/>
|
|
|
e2df08 |
<video>
|
|
|
e2df08 |
- <model type="vmvga" vram="9216" heads="1"/>
|
|
|
e2df08 |
+ <model type="vmvga" vram="16384" heads="1"/>
|
|
|
e2df08 |
</video>
|
|
|
e2df08 |
|
|
|
e2df08 |
Domain 'test-many-devices' defined successfully.
|
|
|
e2df08 |
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-select-sound-model.xml b/tests/cli-test-xml/compare/virt-xml-edit-select-sound-model.xml
|
|
|
e2df08 |
index ce048b5..d5e15bf 100644
|
|
|
e2df08 |
--- a/tests/cli-test-xml/compare/virt-xml-edit-select-sound-model.xml
|
|
|
e2df08 |
+++ b/tests/cli-test-xml/compare/virt-xml-edit-select-sound-model.xml
|
|
|
e2df08 |
@@ -4,7 +4,7 @@
|
|
|
e2df08 |
- <sound model="ich6"/>
|
|
|
e2df08 |
+ <sound model="pcspk"/>
|
|
|
e2df08 |
<video>
|
|
|
e2df08 |
- <model type="vmvga" vram="9216" heads="1"/>
|
|
|
e2df08 |
+ <model type="vmvga" vram="16384" heads="1"/>
|
|
|
e2df08 |
</video>
|
|
|
e2df08 |
|
|
|
e2df08 |
Domain 'test-many-devices' defined successfully.
|
|
|
e2df08 |
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-video.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-video.xml
|
|
|
e2df08 |
index 266bba3..f70c7da 100644
|
|
|
e2df08 |
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-video.xml
|
|
|
e2df08 |
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-video.xml
|
|
|
e2df08 |
@@ -1,11 +1,11 @@
|
|
|
e2df08 |
<sound model="es1370"/>
|
|
|
e2df08 |
<sound model="ich6"/>
|
|
|
e2df08 |
<video>
|
|
|
e2df08 |
-- <model type="vmvga" vram="9216" heads="1"/>
|
|
|
e2df08 |
-+ <model type="cirrus" vram="9216" heads="1"/>
|
|
|
e2df08 |
+- <model type="vmvga" vram="16384" heads="1"/>
|
|
|
e2df08 |
++ <model type="cirrus" vram="16384" heads="1"/>
|
|
|
e2df08 |
</video>
|
|
|
e2df08 |
<video>
|
|
|
e2df08 |
- <model type="cirrus" vram="10240" heads="3"/>
|
|
|
e2df08 |
+ <model type="cirrus" vram="16384" heads="3"/>
|
|
|
e2df08 |
|
|
|
e2df08 |
Domain 'test-many-devices' defined successfully.
|
|
|
e2df08 |
Changes will take effect after the next domain shutdown.
|
|
|
e2df08 |
\ No newline at end of file
|
|
|
e2df08 |
diff --git a/tests/cli-test-xml/compare/virt-xml-remove-sound-model.xml b/tests/cli-test-xml/compare/virt-xml-remove-sound-model.xml
|
|
|
e2df08 |
index 23d2679..28fbe26 100644
|
|
|
e2df08 |
--- a/tests/cli-test-xml/compare/virt-xml-remove-sound-model.xml
|
|
|
e2df08 |
+++ b/tests/cli-test-xml/compare/virt-xml-remove-sound-model.xml
|
|
|
e2df08 |
@@ -3,7 +3,7 @@
|
|
|
e2df08 |
<sound model="es1370"/>
|
|
|
e2df08 |
- <sound model="ich6"/>
|
|
|
e2df08 |
<video>
|
|
|
e2df08 |
- <model type="vmvga" vram="9216" heads="1"/>
|
|
|
e2df08 |
+ <model type="vmvga" vram="16384" heads="1"/>
|
|
|
e2df08 |
</video>
|
|
|
e2df08 |
|
|
|
e2df08 |
Domain 'test-many-devices' defined successfully.
|
|
|
e2df08 |
diff --git a/tests/cli-test-xml/compare/virt-xml-remove-video-all.xml b/tests/cli-test-xml/compare/virt-xml-remove-video-all.xml
|
|
|
e2df08 |
index 1a8c711..866fc14 100644
|
|
|
e2df08 |
--- a/tests/cli-test-xml/compare/virt-xml-remove-video-all.xml
|
|
|
e2df08 |
+++ b/tests/cli-test-xml/compare/virt-xml-remove-video-all.xml
|
|
|
e2df08 |
@@ -2,10 +2,10 @@
|
|
|
e2df08 |
<sound model="es1370"/>
|
|
|
e2df08 |
<sound model="ich6"/>
|
|
|
e2df08 |
- <video>
|
|
|
e2df08 |
-- <model type="vmvga" vram="9216" heads="1"/>
|
|
|
e2df08 |
+- <model type="vmvga" vram="16384" heads="1"/>
|
|
|
e2df08 |
- </video>
|
|
|
e2df08 |
- <video>
|
|
|
e2df08 |
-- <model type="cirrus" vram="10240" heads="3"/>
|
|
|
e2df08 |
+- <model type="cirrus" vram="16384" heads="3"/>
|
|
|
e2df08 |
- </video>
|
|
|
e2df08 |
<hostdev mode="subsystem" type="usb" managed="yes">
|
|
|
e2df08 |
<source>
|
|
|
e2df08 |
--
|
|
|
e2df08 |
1.9.3
|
|
|
e2df08 |
|