Re: [libvirt] [PATCH 1/3] change machine name ppce500v2 as ppce500

2014-05-26 Thread Ján Tomko 
On 05/22/2014 12:55 PM, Olivia Yin wrote:
 ---
  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(-)
 

I don't see any mention of 'ppce500v2' in qemu git. If this got into libvirt
by accident, it would be nice to mention it in the commit message.

Jan



signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH 1/3] change machine name ppce500v2 as ppce500

2014-05-22 Thread Olivia Yin 
---
 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 4249ed5..af67123 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -371,7 +371,7 @@
 valueg3beige/value
 valuemac99/value
 valueprep/value
-valueppce500v2/value
+valueppce500/value
   /choice
 /attribute
   /optional
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args 
b/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args
index fd7e994..5d6dc45 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 3674621..04f0eb6 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
 cmdlineroot=/dev/ram rw console=ttyS0,115200/cmdline
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index a8884ba..7e24909 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;
 
-- 
1.8.5

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list