53 lines
2.4 KiB
Diff
53 lines
2.4 KiB
Diff
From 3ee5e12e58f876cf2ffc7d668e4ce9d461a9a7fd Mon Sep 17 00:00:00 2001
|
|
From: Laine Stump <laine@laine.org>
|
|
Date: Fri, 9 Dec 2011 15:55:14 -0500
|
|
Subject: [PATCH 12/13] test: replace deprecated "fedora-13" machine with
|
|
"pc-0.13"
|
|
|
|
This is a direct cherry-pick of upstream commit 7204a9f. This patch is a
|
|
prerequisite for the following patch "qemu: replace deprecated
|
|
fedora-13 machine type with pc-0.14", which resolves
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=754772 .
|
|
|
|
One of the xml tests in the test suite was created using a
|
|
now-deprecated qemu machine type ("fedora-13", which was only ever
|
|
valid for Fedora builds of qemu). Although strictly speaking it's not
|
|
necessary to replace it with an actual supported qemu machine type
|
|
(since the xml in question is never actually sent to qemu), this patch
|
|
changes it to the actually-supported "pc-0.13" just for general
|
|
tidiness. (Also, on some Fedora builds which contain a special patch
|
|
to rid the world of "fedora-13", having it mentioned in the test suite
|
|
will cause make check to fail.)
|
|
---
|
|
.../qemuxml2argv-encrypted-disk.args | 2 +-
|
|
.../qemuxml2argv-encrypted-disk.xml | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args
|
|
index 1da0073..c6634fd 100644
|
|
--- a/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args
|
|
+++ b/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args
|
|
@@ -1,5 +1,5 @@
|
|
LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin HOME=/root USER=root LOGNAME=root \
|
|
-/usr/bin/qemu -S -M fedora-13 -m 1024 -smp 1,sockets=1,cores=1,threads=1 -name \
|
|
+/usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1,sockets=1,cores=1,threads=1 -name \
|
|
encryptdisk -uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 -nographic -nodefconfig \
|
|
-nodefaults -chardev socket,id=monitor,\
|
|
path=//var/lib/libvirt/qemu/encryptdisk.monitor,server,nowait -mon \
|
|
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.xml b/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.xml
|
|
index f5e5d74..fdcf624 100644
|
|
--- a/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.xml
|
|
+++ b/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.xml
|
|
@@ -5,7 +5,7 @@
|
|
<currentMemory>524288</currentMemory>
|
|
<vcpu>1</vcpu>
|
|
<os>
|
|
- <type arch='i686' machine='fedora-13'>hvm</type>
|
|
+ <type arch='i686' machine='pc-0.13'>hvm</type>
|
|
<boot dev='hd'/>
|
|
</os>
|
|
<clock offset='utc'/>
|
|
--
|
|
1.7.7.3
|
|
|