tests: qemuxml2argvdata: Port 'qemu-system-arm' cases with fake tests to 'qemu-system...

'qemu-system-aarch64' is superset of the soon to be deprecated
'qemu-system-arm' binary. We can move over all of our fake-caps tests to
real caps on aarch64.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.aarch64-latest.args
similarity index 54%
rename from tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
rename to tests/qemuxml2argvdata/aarch64-kvm-32-on-64.aarch64-latest.args
index cc30235695f0e7218c704facbd53c1307cc5e6c7..b04ebf79ccbc7470e209d3e1d0ad0acda1b19b99 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.aarch64-latest.args
@@ -6,14 +6,15 @@ LOGNAME=test \
 XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.local/share \
 XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.cache \
 XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.config \
-/usr/bin/qemu-system-arm \
+/usr/bin/qemu-system-aarch64 \
 -name guest=armtest,debug-threads=on \
 -S \
--object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-armtest/master-key.aes \
--machine virt,usb=off,dump-guest-core=off \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-armtest/master-key.aes"}' \
+-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram \
 -accel kvm \
 -cpu host,aarch64=off \
 -m 1024 \
+-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
@@ -28,12 +29,16 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.config \
 -kernel /arm.kernel \
 -initrd /arm.initrd \
 -append 'console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0' \
+-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \
+-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \
+-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x2"}' \
 -blockdev '{"driver":"file","filename":"/arm.raw","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
--device virtio-blk-device,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
+-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x0","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \
 -netdev user,id=hostnet0 \
--device virtio-net-device,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37 \
+-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \
 -chardev pty,id=charserial0 \
 -serial chardev:charserial0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.xml b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.xml
index 0df5e4c926b63a456c37690be90d27a0e69ed3e8..c145b5f2461f1666d06c2f578271d5aad229265d 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.xml
+++ b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-arm</emulator>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <disk type='file' device='disk'>
       <source file='/arm.raw'/>
       <target dev='vda' bus='virtio'/>

diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args b/tests/qemuxml2argvdata/arm-vexpressa9-basic.aarch64-latest.args
similarity index 71%
rename from tests/qemuxml2argvdata/arm-vexpressa9-basic.args
rename to tests/qemuxml2argvdata/arm-vexpressa9-basic.aarch64-latest.args
index 3c95699e40a9feff095df28411b5d74500fd988b..043c714ffa25fba3315a85031f36e8d1f99da956 100644 (file)
--- a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-basic.aarch64-latest.args
@@ -6,13 +6,15 @@ LOGNAME=test \
 XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.local/share \
 XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.cache \
 XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.config \
-/usr/bin/qemu-system-arm \
+/usr/bin/qemu-system-aarch64 \
 -name guest=armtest,debug-threads=on \
 -S \
--object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-armtest/master-key.aes \
--machine vexpress-a9,usb=off,dump-guest-core=off \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-armtest/master-key.aes"}' \
+-machine vexpress-a9,usb=off,dump-guest-core=off,memory-backend=vexpress.highmem \
 -accel tcg \
+-cpu cortex-a9 \
 -m 1024 \
+-object '{"qom-type":"memory-backend-ram","id":"vexpress.highmem","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
@@ -35,4 +37,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.config \
 -chardev pty,id=charserial0 \
 -serial chardev:charserial0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-basic.xml b/tests/qemuxml2argvdata/arm-vexpressa9-basic.xml
index ec9374f88ba05b1e8e8cc17a24e86bdfac4b5297..80efab2c49d820ad7ca609c3767496fab9d5c0d9 100644 (file)
--- a/tests/qemuxml2argvdata/arm-vexpressa9-basic.xml
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-basic.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-arm</emulator>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <disk type='file' device='disk'>
       <source file='/arm.raw'/>
       <target dev='sda' bus='sd'/>

diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.aarch64-latest.args
similarity index 66%
rename from tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
rename to tests/qemuxml2argvdata/arm-vexpressa9-nodevs.aarch64-latest.args
index 0dbd6f32dcf522685894efe8e4e6957004616035..9036b03b006702d85812c755cda7f8df82fc278c 100644 (file)
--- a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.aarch64-latest.args
@@ -6,13 +6,15 @@ LOGNAME=test \
 XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.local/share \
 XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.cache \
 XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.config \
-/usr/bin/qemu-system-arm \
+/usr/bin/qemu-system-aarch64 \
 -name guest=armtest,debug-threads=on \
 -S \
--object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-armtest/master-key.aes \
--machine vexpress-a9,usb=off,dump-guest-core=off \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-armtest/master-key.aes"}' \
+-machine vexpress-a9,usb=off,dump-guest-core=off,memory-backend=vexpress.highmem \
 -accel tcg \
+-cpu cortex-a9 \
 -m 1024 \
+-object '{"qom-type":"memory-backend-ram","id":"vexpress.highmem","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
@@ -30,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.config \
 -dtb /arm.dtb \
 -usb \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.xml b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.xml
index 3f318c8bb29c6416a52d12c3e7b78ede1882d189..44ee27a659f14c4acd1d7c65f2c6604f9335c51c 100644 (file)
--- a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.xml
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.xml
@@ -21,6 +21,6 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-arm</emulator>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
   </devices>
 </domain>

diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.aarch64-latest.args
similarity index 55%
rename from tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
rename to tests/qemuxml2argvdata/arm-vexpressa9-virtio.aarch64-latest.args
index 502385fa517b097f7b67fcad8f00e3ee6c59e499..0bd6145edfa97fc6060983384610d1e8263564f8 100644 (file)
--- a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.aarch64-latest.args
@@ -6,13 +6,15 @@ LOGNAME=test \
 XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.local/share \
 XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.cache \
 XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.config \
-/usr/bin/qemu-system-arm \
+/usr/bin/qemu-system-aarch64 \
 -name guest=armtest,debug-threads=on \
 -S \
--object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-armtest/master-key.aes \
--machine vexpress-a9,usb=off,dump-guest-core=off \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-armtest/master-key.aes"}' \
+-machine vexpress-a9,usb=off,dump-guest-core=off,memory-backend=vexpress.highmem \
 -accel tcg \
+-cpu cortex-a9 \
 -m 1024 \
+-object '{"qom-type":"memory-backend-ram","id":"vexpress.highmem","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
@@ -28,19 +30,20 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.config \
 -initrd /arm.initrd \
 -append 'console=ttyAMA0,115200n8 rw root=/dev/vda3 rootwait physmap.enabled=0' \
 -dtb /arm.dtb \
--device virtio-serial-device,id=virtio-serial0 \
+-device '{"driver":"virtio-serial-device","id":"virtio-serial0"}' \
 -usb \
 -blockdev '{"driver":"file","filename":"/arm.raw","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
--device virtio-blk-device,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
+-device '{"driver":"virtio-blk-device","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \
 -netdev user,id=hostnet0 \
--device virtio-net-device,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37 \
+-device '{"driver":"virtio-net-device","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37"}' \
 -chardev pty,id=charserial0 \
 -serial chardev:charserial0 \
 -chardev pty,id=charconsole1 \
--device virtconsole,chardev=charconsole1,id=console1 \
+-device '{"driver":"virtconsole","chardev":"charconsole1","id":"console1"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-device,id=balloon0 \
--object rng-random,id=objrng0,filename=/dev/random \
--device virtio-rng-device,rng=objrng0,id=rng0 \
+-device '{"driver":"virtio-balloon-device","id":"balloon0"}' \
+-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}' \
+-device '{"driver":"virtio-rng-device","rng":"objrng0","id":"rng0"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.xml b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.xml
index 2acf3c968041f633553ebd806e44703d0bd577ca..b498d1761b7893fe73ec04cf116892d46bb1ff79 100644 (file)
--- a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.xml
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-arm</emulator>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <disk type='file' device='disk'>
       <source file='/arm.raw'/>
       <target dev='vda' bus='virtio'/>

diff --git a/tests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.args b/tests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.args
new file mode 100644 (file)
index 0000000..31fc9bb
--- /dev/null
+++ b/tests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.args
@@ -0,0 +1,54 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-armtest \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.config \
+/usr/bin/qemu-system-aarch64 \
+-name guest=armtest,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-armtest/master-key.aes"}' \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram \
+-accel tcg \
+-cpu cortex-a15 \
+-m 1024 \
+-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-kernel /arm.kernel \
+-initrd /arm.initrd \
+-append 'console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0' \
+-dtb /arm.dtb \
+-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \
+-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \
+-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x2"}' \
+-device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bus":"pcie.0","addr":"0x1.0x3"}' \
+-device '{"driver":"pcie-root-port","port":12,"chassis":5,"id":"pci.5","bus":"pcie.0","addr":"0x1.0x4"}' \
+-device '{"driver":"pcie-root-port","port":13,"chassis":6,"id":"pci.6","bus":"pcie.0","addr":"0x1.0x5"}' \
+-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.2","addr":"0x0"}' \
+-blockdev '{"driver":"file","filename":"/arm.raw","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x0","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \
+-netdev user,id=hostnet0 \
+-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \
+-chardev pty,id=charserial0 \
+-serial chardev:charserial0 \
+-chardev pty,id=charconsole1 \
+-device '{"driver":"virtconsole","chardev":"charconsole1","id":"console1"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.4","addr":"0x0"}' \
+-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}' \
+-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci.5","addr":"0x0"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on

diff --git a/tests/qemuxml2argvdata/arm-virt-virtio.args b/tests/qemuxml2argvdata/arm-virt-virtio.args
deleted file mode 100644 (file)
index 0190d43..0000000
--- a/tests/qemuxml2argvdata/arm-virt-virtio.args
+++ /dev/null
@@ -1,45 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-armtest \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.config \
-/usr/bin/qemu-system-arm \
--name guest=armtest,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-armtest/master-key.aes \
--machine virt,usb=off,dump-guest-core=off \
--accel tcg \
--m 1024 \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--boot strict=on \
--kernel /arm.kernel \
--initrd /arm.initrd \
--append 'console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0' \
--dtb /arm.dtb \
--device virtio-serial-device,id=virtio-serial0 \
--blockdev '{"driver":"file","filename":"/arm.raw","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
--blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
--device virtio-blk-device,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
--netdev user,id=hostnet0 \
--device virtio-net-device,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37 \
--chardev pty,id=charserial0 \
--serial chardev:charserial0 \
--chardev pty,id=charconsole1 \
--device virtconsole,chardev=charconsole1,id=console1 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-device,id=balloon0 \
--object rng-random,id=objrng0,filename=/dev/random \
--device virtio-rng-device,rng=objrng0,id=rng0 \
--msg timestamp=on

diff --git a/tests/qemuxml2argvdata/arm-virt-virtio.xml b/tests/qemuxml2argvdata/arm-virt-virtio.xml
index 913c96eef074b7179f39904b82e5aa199f946a30..39620070bd1a7501a58ae86c5e0162c61b2bd6bd 100644 (file)
--- a/tests/qemuxml2argvdata/arm-virt-virtio.xml
+++ b/tests/qemuxml2argvdata/arm-virt-virtio.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-arm</emulator>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <disk type='file' device='disk'>
       <source file='/arm.raw'/>
       <target dev='vda' bus='virtio'/>

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index eaea0c103c47b593454d0103145b8060c9f1ddd7..c0afb8cf2745fb1e9c7e46a7075a8aa9e24c81b2 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2407,15 +2407,10 @@ mymain(void)
             QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_DEVICE_QXL);
 
-    DO_TEST_NOCAPS("arm-vexpressa9-nodevs");
-    DO_TEST_NOCAPS("arm-vexpressa9-basic");
-    DO_TEST("arm-vexpressa9-virtio",
-            QEMU_CAPS_DEVICE_VIRTIO_MMIO,
-            QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
-    DO_TEST("arm-virt-virtio",
-            QEMU_CAPS_DEVICE_VIRTIO_MMIO,
-            QEMU_CAPS_DEVICE_PL011,
-            QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
+    DO_TEST_CAPS_ARCH_LATEST("arm-vexpressa9-nodevs", "aarch64");
+    DO_TEST_CAPS_ARCH_LATEST("arm-vexpressa9-basic", "aarch64");
+    DO_TEST_CAPS_ARCH_LATEST("arm-vexpressa9-virtio", "aarch64");
+    DO_TEST_CAPS_ARCH_LATEST("arm-virt-virtio", "aarch64");
 
     DO_TEST("aarch64-virt-virtio",
             QEMU_CAPS_DEVICE_VIRTIO_MMIO,
@@ -2533,10 +2528,7 @@ mymain(void)
     DO_TEST_PARSE_ERROR("aarch64-gic-not-arm",
                         QEMU_CAPS_KVM,
                         QEMU_CAPS_MACH_VIRT_GIC_VERSION);
-    DO_TEST("aarch64-kvm-32-on-64",
-            QEMU_CAPS_DEVICE_VIRTIO_MMIO,
-            QEMU_CAPS_DEVICE_PL011,
-            QEMU_CAPS_KVM);
+    DO_TEST_CAPS_ARCH_LATEST("aarch64-kvm-32-on-64", "aarch64");
     DO_TEST("aarch64-pci-serial",
             QEMU_CAPS_DEVICE_PCI_SERIAL,
             QEMU_CAPS_OBJECT_GPEX,