|
 |
e2df08 |
From be40e0c78bb2bb700ce9ed5dc0c85783fe87ce1f Mon Sep 17 00:00:00 2001
|
|
|
e2df08 |
From: Giuseppe Scrivano <gscrivan@redhat.com>
|
|
|
e2df08 |
Date: Mon, 15 Sep 2014 11:26:19 +0200
|
|
|
e2df08 |
Subject: [PATCH 01/12] test: Fix tests with latest libvirt
|
|
|
e2df08 |
|
|
|
e2df08 |
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1111986
|
|
|
e2df08 |
|
|
|
e2df08 |
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
|
|
|
e2df08 |
(cherry picked from commit 1341928e924c35883d47064e394109a622b5a1f3)
|
|
|
e2df08 |
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
|
|
|
e2df08 |
---
|
|
|
e2df08 |
tests/cli-test-xml/compare/virt-clone-clone-auto1.xml | 2 +-
|
|
|
e2df08 |
tests/cli-test-xml/compare/virt-clone-clone-auto2.xml | 2 +-
|
|
|
e2df08 |
tests/cli-test-xml/compare/virt-xml-edit-simple-boot.xml | 4 ++--
|
|
|
e2df08 |
tests/cli-test-xml/compare/virt-xml-edit-simple-idmap.xml | 2 +-
|
|
|
e2df08 |
4 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
e2df08 |
|
|
|
e2df08 |
diff --git a/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml b/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml
|
|
|
e2df08 |
index 03b7b5c..3979a25 100644
|
|
|
e2df08 |
--- a/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml
|
|
|
e2df08 |
+++ b/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml
|
|
|
e2df08 |
@@ -6,7 +6,7 @@
|
|
|
e2df08 |
<vcpu placement="static">5</vcpu>
|
|
|
e2df08 |
<os>
|
|
|
e2df08 |
<type arch="i686">hvm</type>
|
|
|
e2df08 |
- <loader>/usr/lib/xen/boot/hvmloader</loader>
|
|
|
e2df08 |
+ <loader type="rom">/usr/lib/xen/boot/hvmloader</loader>
|
|
|
e2df08 |
<boot dev="hd"/>
|
|
|
e2df08 |
</os>
|
|
|
e2df08 |
<features>
|
|
|
e2df08 |
diff --git a/tests/cli-test-xml/compare/virt-clone-clone-auto2.xml b/tests/cli-test-xml/compare/virt-clone-clone-auto2.xml
|
|
|
e2df08 |
index bbbde76..af8c7aa 100644
|
|
|
e2df08 |
--- a/tests/cli-test-xml/compare/virt-clone-clone-auto2.xml
|
|
|
e2df08 |
+++ b/tests/cli-test-xml/compare/virt-clone-clone-auto2.xml
|
|
|
e2df08 |
@@ -6,7 +6,7 @@
|
|
|
e2df08 |
<vcpu placement="static">5</vcpu>
|
|
|
e2df08 |
<os>
|
|
|
e2df08 |
<type arch="i686">hvm</type>
|
|
|
e2df08 |
- <loader>/usr/lib/xen/boot/hvmloader</loader>
|
|
|
e2df08 |
+ <loader type="rom">/usr/lib/xen/boot/hvmloader</loader>
|
|
|
e2df08 |
<boot dev="hd"/>
|
|
|
e2df08 |
</os>
|
|
|
e2df08 |
<features>
|
|
|
e2df08 |
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-boot.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-boot.xml
|
|
|
e2df08 |
index 246d58c..f8e0739 100644
|
|
|
e2df08 |
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-boot.xml
|
|
|
e2df08 |
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-boot.xml
|
|
|
e2df08 |
@@ -1,8 +1,8 @@
|
|
|
e2df08 |
</numatune>
|
|
|
e2df08 |
<os>
|
|
|
e2df08 |
<type arch="i686">hvm</type>
|
|
|
e2df08 |
-- <loader>/usr/lib/xen/boot/hvmloader</loader>
|
|
|
e2df08 |
-+ <loader>foo.bar</loader>
|
|
|
e2df08 |
+- <loader type="rom">/usr/lib/xen/boot/hvmloader</loader>
|
|
|
e2df08 |
++ <loader type="rom">foo.bar</loader>
|
|
|
e2df08 |
+ <bios useserial="yes"/>
|
|
|
e2df08 |
+ <init>/bin/bash</init>
|
|
|
e2df08 |
</os>
|
|
|
e2df08 |
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-idmap.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-idmap.xml
|
|
|
e2df08 |
index 1060179..d2e35bc 100644
|
|
|
e2df08 |
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-idmap.xml
|
|
|
e2df08 |
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-idmap.xml
|
|
|
e2df08 |
@@ -1,4 +1,4 @@
|
|
|
e2df08 |
- <loader>/usr/lib/xen/boot/hvmloader</loader>
|
|
|
e2df08 |
+ <loader type="rom">/usr/lib/xen/boot/hvmloader</loader>
|
|
|
e2df08 |
</os>
|
|
|
e2df08 |
<idmap>
|
|
|
e2df08 |
- <uid start="0" target="1000" count="10"/>
|
|
|
e2df08 |
--
|
|
|
e2df08 |
1.9.3
|
|
|
e2df08 |
|