From 5201a8edf521930ba8ed3cc8c901f12d80658e1b Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Tue, 25 Nov 2014 10:35:43 +0100
Subject: [PATCH 2/2] tests: fix failures with newer libvirt version

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
(cherry picked from commit 9d633879b1b11bc151fb64a0782c0c35c524ad18)
---
 tests/cli-test-xml/compare/virt-xml-edit-neg-num.xml            | 6 +++---
 tests/cli-test-xml/compare/virt-xml-edit-pos-num.xml            | 2 +-
 tests/cli-test-xml/compare/virt-xml-edit-select-sound-model.xml | 2 +-
 tests/cli-test-xml/compare/virt-xml-edit-simple-video.xml       | 6 +++---
 tests/cli-test-xml/compare/virt-xml-remove-sound-model.xml      | 2 +-
 tests/cli-test-xml/compare/virt-xml-remove-video-all.xml        | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

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
index 044862d..6b84355 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-neg-num.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-neg-num.xml
@@ -1,8 +1,8 @@
-       <model type="vmvga" vram="9216" heads="1"/>
+       <model type="vmvga" vram="16384" heads="1"/>
      </video>
      <video>
--      <model type="cirrus" vram="10240" heads="3"/>
-+      <model type="qxl" vram="10240" heads="3"/>
+-      <model type="cirrus" vram="16384" heads="3"/>
++      <model type="qxl" vram="16384" heads="3"/>
      </video>
      <hostdev mode="subsystem" type="usb" managed="yes">
        <source>
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
index ce048b5..d5e15bf 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-pos-num.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-pos-num.xml
@@ -4,7 +4,7 @@
 -    <sound model="ich6"/>
 +    <sound model="pcspk"/>
      <video>
-       <model type="vmvga" vram="9216" heads="1"/>
+       <model type="vmvga" vram="16384" heads="1"/>
      </video>
 
 Domain 'test-many-devices' defined successfully.
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
index ce048b5..d5e15bf 100644
--- 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
@@ -4,7 +4,7 @@
 -    <sound model="ich6"/>
 +    <sound model="pcspk"/>
      <video>
-       <model type="vmvga" vram="9216" heads="1"/>
+       <model type="vmvga" vram="16384" heads="1"/>
      </video>
 
 Domain 'test-many-devices' defined successfully.
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
index 266bba3..f70c7da 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-video.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-video.xml
@@ -1,11 +1,11 @@
      <sound model="es1370"/>
      <sound model="ich6"/>
      <video>
--      <model type="vmvga" vram="9216" heads="1"/>
-+      <model type="cirrus" vram="9216" heads="1"/>
+-      <model type="vmvga" vram="16384" heads="1"/>
++      <model type="cirrus" vram="16384" heads="1"/>
      </video>
      <video>
-       <model type="cirrus" vram="10240" heads="3"/>
+       <model type="cirrus" vram="16384" heads="3"/>
 
 Domain 'test-many-devices' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
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
index 23d2679..28fbe26 100644
--- a/tests/cli-test-xml/compare/virt-xml-remove-sound-model.xml
+++ b/tests/cli-test-xml/compare/virt-xml-remove-sound-model.xml
@@ -3,7 +3,7 @@
      <sound model="es1370"/>
 -    <sound model="ich6"/>
      <video>
-       <model type="vmvga" vram="9216" heads="1"/>
+       <model type="vmvga" vram="16384" heads="1"/>
      </video>
 
 Domain 'test-many-devices' defined successfully.
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
index 1a8c711..866fc14 100644
--- a/tests/cli-test-xml/compare/virt-xml-remove-video-all.xml
+++ b/tests/cli-test-xml/compare/virt-xml-remove-video-all.xml
@@ -2,10 +2,10 @@
      <sound model="es1370"/>
      <sound model="ich6"/>
 -    <video>
--      <model type="vmvga" vram="9216" heads="1"/>
+-      <model type="vmvga" vram="16384" heads="1"/>
 -    </video>
 -    <video>
--      <model type="cirrus" vram="10240" heads="3"/>
+-      <model type="cirrus" vram="16384" heads="3"/>
 -    </video>
      <hostdev mode="subsystem" type="usb" managed="yes">
        <source>
-- 
1.9.3