From 61b1c681e0c7ed8b896f2da36b4aba0309950f31 Mon Sep 17 00:00:00 2001
From: Olivia Yin <Hong-Hua.Yin@freescale.com>
Date: Tue, 27 May 2014 13:44:13 +0800
Subject: [PATCH] change machine name ppce500v2 to ppce500
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ppce500v2 is not machine supported by official release of QEMU.
It should be replaced by ppce500.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
---
 docs/schemas/domaincommon.rng                    | 2 +-
 tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args | 2 +-
 tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.xml  | 2 +-
 tests/testutilsqemu.c                            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 4249ed56e6..af671235d3 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -371,7 +371,7 @@
             <value>g3beige</value>
             <value>mac99</value>
             <value>prep</value>
-            <value>ppce500v2</value>
+            <value>ppce500</value>
           </choice>
         </attribute>
       </optional>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args b/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args
index fd7e99473a..5d6dc45f11 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args
@@ -1,5 +1,5 @@
 LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-ppc -S -M ppce500v2 -m 256 -smp 1 -nographic \
+/usr/bin/qemu-system-ppc -S -M ppce500 -m 256 -smp 1 -nographic \
 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
 -kernel /media/ram/uImage -initrd /media/ram/ramdisk \
 -append 'root=/dev/ram rw console=ttyS0,115200' -dtb /media/ram/test.dtb \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.xml b/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.xml
index 36746216a0..04f0eb6624 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>262144</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='ppc' machine='ppce500v2'>hvm</type>
+    <type arch='ppc' machine='ppce500'>hvm</type>
     <kernel>/media/ram/uImage</kernel>
     <initrd>/media/ram/ramdisk</initrd>
     <cmdline>root=/dev/ram rw console=ttyS0,115200</cmdline>
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index a8884bafcc..7e24909bee 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -91,7 +91,7 @@ static int testQemuAddPPCGuest(virCapsPtr caps)
     static const char *machine[] = { "g3beige",
                                      "mac99",
                                      "prep",
-                                     "ppce500v2" };
+                                     "ppce500" };
     virCapsGuestMachinePtr *machines = NULL;
     virCapsGuestPtr guest;