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

'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>
2024-12-22 13:45:38 +00:00 · 2023-03-03 14:38:25 +01:00 · 2023-03-03 14:38:25 +01:00 · 9f805d3757
commit 9f805d3757
parent 76f441283a
12 changed files with 99 additions and 84 deletions
--- a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.aarch64-latest.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
--- 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'/>
--- a/tests/qemuxml2argvdata/arm-vexpressa9-basic.aarch64-latest.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
--- 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'/>
--- a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.aarch64-latest.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
--- 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>
--- a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.aarch64-latest.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
--- 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'/>
--- a/tests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.args
+++ 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
--- a/tests/qemuxml2argvdata/arm-virt-virtio.args
+++ b/tests/qemuxml2argvdata/arm-virt-virtio.args
@ -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
--- 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'/>
--- 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,