8:28 a.m.
Convert the 'ppc-dtb' and 'ppce500-serial' to use real capabilities
albeit captured from a non-native machine. Thus the XML needs to be
converted to use virt type 'qemu'.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../{ppc-dtb.args => ppc-dtb.ppc-latest.args} | 12 +++++++-----
tests/qemuxml2argvdata/ppc-dtb.xml | 2 +-
...00-serial.args => ppce500-serial.ppc-latest.args} | 12 +++++++-----
tests/qemuxml2argvdata/ppce500-serial.xml | 2 +-
tests/qemuxml2argvtest.c | 6 ++----
5 files changed, 18 insertions(+), 16 deletions(-)
rename tests/qemuxml2argvdata/{ppc-dtb.args => ppc-dtb.ppc-latest.args} (62%)
rename tests/qemuxml2argvdata/{ppce500-serial.args => ppce500-serial.ppc-latest.args}
(62%)
diff --git a/tests/qemuxml2argvdata/ppc-dtb.args
b/tests/qemuxml2argvdata/ppc-dtb.ppc-latest.args
similarity index 62%
rename from tests/qemuxml2argvdata/ppc-dtb.args
rename to tests/qemuxml2argvdata/ppc-dtb.ppc-latest.args
index 951edcda6b..1cf06ffbac 100644
--- a/tests/qemuxml2argvdata/ppc-dtb.args
+++ b/tests/qemuxml2argvdata/ppc-dtb.ppc-latest.args
@@ -9,10 +9,11 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-ppc \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine ppce500,usb=off,dump-guest-core=off \
--accel kvm \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine ppce500,usb=off,dump-guest-core=off,memory-backend=mpc8544ds.ram \
+-accel tcg \
-m 256 \
+-object
'{"qom-type":"memory-backend-ram","id":"mpc8544ds.ram","size":268435456}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 49545eb3-75e1-2d0a-acdd-f0294406c99e \
@@ -28,9 +29,10 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-initrd /media/ram/ramdisk \
-append 'root=/dev/ram rw console=ttyS0,115200' \
-dtb /media/ram/test.dtb \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1"}'
\
-chardev pty,id=charserial0 \
-serial chardev:charserial0 \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/ppc-dtb.xml b/tests/qemuxml2argvdata/ppc-dtb.xml
index 04f0eb6624..37b9b280e7 100644
--- a/tests/qemuxml2argvdata/ppc-dtb.xml
+++ b/tests/qemuxml2argvdata/ppc-dtb.xml
@@ -1,4 +1,4 @@
-<domain type='kvm'>
+<domain type='qemu'>
<name>QEMUGuest1</name>
<uuid>49545eb3-75e1-2d0a-acdd-f0294406c99e</uuid>
<memory unit='KiB'>262144</memory>
diff --git a/tests/qemuxml2argvdata/ppce500-serial.args
b/tests/qemuxml2argvdata/ppce500-serial.ppc-latest.args
similarity index 62%
rename from tests/qemuxml2argvdata/ppce500-serial.args
rename to tests/qemuxml2argvdata/ppce500-serial.ppc-latest.args
index 1698f50498..1c1a387f62 100644
--- a/tests/qemuxml2argvdata/ppce500-serial.args
+++ b/tests/qemuxml2argvdata/ppce500-serial.ppc-latest.args
@@ -9,10 +9,11 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-ppc \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine ppce500,usb=off,dump-guest-core=off \
--accel kvm \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine ppce500,usb=off,dump-guest-core=off,memory-backend=mpc8544ds.ram \
+-accel tcg \
-m 256 \
+-object
'{"qom-type":"memory-backend-ram","id":"mpc8544ds.ram","size":268435456}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -27,9 +28,10 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-kernel /media/ram/uImage \
-initrd /media/ram/ramdisk \
-append 'root=/dev/ram rw console=ttyS0,115200' \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1"}'
\
-chardev pty,id=charserial0 \
-serial chardev:charserial0 \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/ppce500-serial.xml
b/tests/qemuxml2argvdata/ppce500-serial.xml
index 4e656d5ffe..20a3b1e7a8 100644
--- a/tests/qemuxml2argvdata/ppce500-serial.xml
+++ b/tests/qemuxml2argvdata/ppce500-serial.xml
@@ -1,4 +1,4 @@
-<domain type='kvm'>
+<domain type='qemu'>
<name>QEMUGuest1</name>
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>262144</memory>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index db846c1ea4..e515c2c0df 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2222,10 +2222,8 @@ mymain(void)
DO_TEST("s390-serial-console",
QEMU_CAPS_DEVICE_SCLPCONSOLE);
- DO_TEST("ppc-dtb",
- QEMU_CAPS_KVM);
- DO_TEST("ppce500-serial",
- QEMU_CAPS_KVM);
+ DO_TEST_CAPS_ARCH_LATEST("ppc-dtb", "ppc");
+ DO_TEST_CAPS_ARCH_LATEST("ppce500-serial", "ppc");
DO_TEST_CAPS_LATEST("tpm-passthrough");
DO_TEST_CAPS_LATEST("tpm-passthrough-crb");
--
2.39.2