External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 05:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

change machine name ppce500v2 to ppce500

Browse Source 
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>
This commit is contained in:
Olivia Yin 2014-05-27 13:44:13 +08:00 committed by Ján Tomko
parent f07d24a6b8
commit 61b1c681e0
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/schemas/domaincommon.rng
View File

@ -371,7 +371,7 @@
<value>g3beige</value> <value>g3beige</value>
<value>mac99</value> <value>mac99</value>
<value>prep</value> <value>prep</value>
<value>ppce500v2</value> <value>ppce500</value>
</choice> </choice>
</attribute> </attribute>
</optional> </optional>

2
tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args
View File

@ -1,5 +1,5 @@
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ 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 \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
-kernel /media/ram/uImage -initrd /media/ram/ramdisk \ -kernel /media/ram/uImage -initrd /media/ram/ramdisk \
-append 'root=/dev/ram rw console=ttyS0,115200' -dtb /media/ram/test.dtb \ -append 'root=/dev/ram rw console=ttyS0,115200' -dtb /media/ram/test.dtb \

2
tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>262144</currentMemory> <currentMemory unit='KiB'>262144</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='ppc' machine='ppce500v2'>hvm</type> <type arch='ppc' machine='ppce500'>hvm</type>
<kernel>/media/ram/uImage</kernel> <kernel>/media/ram/uImage</kernel>
<initrd>/media/ram/ramdisk</initrd> <initrd>/media/ram/ramdisk</initrd>
<cmdline>root=/dev/ram rw console=ttyS0,115200</cmdline> <cmdline>root=/dev/ram rw console=ttyS0,115200</cmdline>

2
tests/testutilsqemu.c
View File

@ -91,7 +91,7 @@ static int testQemuAddPPCGuest(virCapsPtr caps)
static const char *machine[] = { "g3beige", static const char *machine[] = { "g3beige",
"mac99", "mac99",
"prep", "prep",
"ppce500v2" }; "ppce500" };
virCapsGuestMachinePtr *machines = NULL; virCapsGuestMachinePtr *machines = NULL;
virCapsGuestPtr guest; virCapsGuestPtr guest;