All of these are either a subset of other tests, or provide
coverage for scenarios that are not really possible: for all
versions of QEMU that we support, the virt machine type has a
hard dependency on the generic PCIe controller, which means
that we will never need to fall back to virtio-mmio.
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
...ch64-aavmf-virtio-mmio.aarch64-latest.args | 46 ---------------
.../aarch64-aavmf-virtio-mmio.xml | 49 ----------------
...rch64-virt-virtio-MMIO.aarch64.latest.args | 48 ----------------
.../arm-virt-virtio.aarch64-latest.args | 54 ------------------
tests/qemuxml2argvdata/arm-virt-virtio.xml | 45 ---------------
.../riscv64-virt-pci.riscv64-latest.args | 35 ------------
tests/qemuxml2argvdata/riscv64-virt-pci.xml | 24 --------
.../riscv64-virt.riscv64-latest.args | 38 -------------
tests/qemuxml2argvdata/riscv64-virt.xml | 19 -------
tests/qemuxml2argvtest.c | 18 ------
...rch64-aavmf-virtio-mmio.aarch64-latest.xml | 56 -------------------
tests/qemuxml2xmltest.c | 4 --
12 files changed, 436 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.aarch64-latest.args
delete mode 100644 tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.xml
delete mode 100644 tests/qemuxml2argvdata/aarch64-virt-virtio-MMIO.aarch64.latest.args
delete mode 100644 tests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.args
delete mode 100644 tests/qemuxml2argvdata/arm-virt-virtio.xml
delete mode 100644 tests/qemuxml2argvdata/riscv64-virt-pci.riscv64-latest.args
delete mode 100644 tests/qemuxml2argvdata/riscv64-virt-pci.xml
delete mode 100644 tests/qemuxml2argvdata/riscv64-virt.riscv64-latest.args
delete mode 100644 tests/qemuxml2argvdata/riscv64-virt.xml
delete mode 100644 tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.aarch64-latest.xml
diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.aarch64-latest.args
deleted file mode 100644
index 5569ff3b57..0000000000
--- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.aarch64-latest.args
+++ /dev/null
@@ -1,46 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-aarch64test \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
-/usr/bin/qemu-system-aarch64 \
--name guest=aarch64test,debug-threads=on \
--S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \
--machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \
--accel tcg \
--cpu cortex-a53 \
--m size=1048576k \
--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-ef08be936e8b \
--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 /aarch64.kernel \
--initrd /aarch64.initrd \
--append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
--dtb /aarch64.dtb \
--device '{"driver":"virtio-serial-device","id":"virtio-serial0"}' \
--blockdev '{"driver":"file","filename":"/aarch64.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-device","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \
--netdev '{"type":"user","id":"hostnet0"}' \
--device '{"driver":"virtio-net-device","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37"}' \
--chardev pty,id=charconsole0 \
--device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}' \
--audiodev '{"id":"audio1","driver":"none"}' \
--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/aarch64-aavmf-virtio-mmio.xml b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.xml
deleted file mode 100644
index 5d7217307b..0000000000
--- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<domain type='qemu'>
- <name>aarch64test</name>
- <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
- <memory unit='KiB'>1048576</memory>
- <currentMemory unit='KiB'>1048576</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='aarch64' machine='virt'>hvm</type>
- <kernel>/aarch64.kernel</kernel>
- <initrd>/aarch64.initrd</initrd>
- <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait</cmdline>
- <dtb>/aarch64.dtb</dtb>
- <boot dev='hd'/>
- </os>
- <features>
- <apic/>
- <pae/>
- <gic version='2'/>
- </features>
- <cpu mode='custom' match='exact'>
- <model fallback='allow'>cortex-a53</model>
- </cpu>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-aarch64</emulator>
- <disk type='file' device='disk'>
- <source file='/aarch64.raw'/>
- <target dev='vda' bus='virtio'/>
- <address type='virtio-mmio'/>
- </disk>
- <controller type='virtio-serial' index='0'/>
- <interface type='user'>
- <mac address='52:54:00:09:a4:37'/>
- <model type='virtio'/>
- </interface>
- <console type='pty'>
- <target type='virtio' port='0'/>
- </console>
- <memballoon model='virtio'>
- <address type='virtio-mmio'/>
- </memballoon>
- <rng model='virtio'>
- <backend model='random'>/dev/random</backend>
- </rng>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio-MMIO.aarch64.latest.args b/tests/qemuxml2argvdata/aarch64-virt-virtio-MMIO.aarch64.latest.args
deleted file mode 100644
index 68eccb441d..0000000000
--- a/tests/qemuxml2argvdata/aarch64-virt-virtio-MMIO.aarch64.latest.args
+++ /dev/null
@@ -1,48 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-aarch64test \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
-/usr/bin/qemu-system-aarch64 \
--name guest=aarch64test,debug-threads=on \
--S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \
--machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \
--accel tcg \
--cpu cortex-a53 \
--m size=1048576k \
--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-ef08be936e8b \
--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 /aarch64.kernel \
--initrd /aarch64.initrd \
--append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
--dtb /aarch64.dtb \
--device '{"driver":"virtio-serial-device","id":"virtio-serial0"}' \
--blockdev '{"driver":"file","filename":"/aarch64.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-device","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \
--netdev '{"type":"user","id":"hostnet0"}' \
--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 '{"driver":"virtconsole","chardev":"charconsole1","id":"console1"}' \
--audiodev '{"id":"audio1","driver":"none"}' \
--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-virt-virtio.aarch64-latest.args b/tests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.args
deleted file mode 100644
index b2266bc9bc..0000000000
--- a/tests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.args
+++ /dev/null
@@ -1,54 +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-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,acpi=on \
--accel tcg \
--cpu cortex-a15 \
--m size=1048576k \
--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 '{"type":"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.xml b/tests/qemuxml2argvdata/arm-virt-virtio.xml
deleted file mode 100644
index 39620070bd..0000000000
--- a/tests/qemuxml2argvdata/arm-virt-virtio.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<domain type="qemu">
- <name>armtest</name>
- <uuid>496d7ea8-9739-544b-4ebd-ef08be936e6a</uuid>
- <memory>1048576</memory>
- <currentMemory>1048576</currentMemory>
- <vcpu>1</vcpu>
- <os>
- <type arch="armv7l" machine="virt">hvm</type>
- <kernel>/arm.kernel</kernel>
- <initrd>/arm.initrd</initrd>
- <dtb>/arm.dtb</dtb>
- <cmdline>console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0</cmdline>
- </os>
- <features>
- <acpi/>
- <apic/>
- <pae/>
- </features>
- <clock offset="utc"/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-aarch64</emulator>
- <disk type='file' device='disk'>
- <source file='/arm.raw'/>
- <target dev='vda' bus='virtio'/>
- </disk>
- <interface type='user'>
- <mac address='52:54:00:09:a4:37'/>
- <model type='virtio'/>
- </interface>
- <console type='pty'/>
- <console type='pty'>
- <target type='virtio' port='0'/>
- </console>
- <memballoon model='virtio'/>
- <!--
- This actually doesn't work in practice because vexpress only has
- 4 virtio slots available, rng makes 5 -->
- <rng model='virtio'>
- <backend model='random'>/dev/random</backend>
- </rng>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvdata/riscv64-virt-pci.riscv64-latest.args b/tests/qemuxml2argvdata/riscv64-virt-pci.riscv64-latest.args
deleted file mode 100644
index ff52cba889..0000000000
--- a/tests/qemuxml2argvdata/riscv64-virt-pci.riscv64-latest.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-riscv64 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-riscv64/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-riscv64/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-riscv64/.config \
-/usr/bin/qemu-system-riscv64 \
--name guest=riscv64,debug-threads=on \
--S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-riscv64/master-key.aes"}' \
--machine virt,usb=off,dump-guest-core=off,memory-backend=riscv_virt_board.ram \
--accel tcg \
--m size=2097152k \
--object '{"qom-type":"memory-backend-ram","id":"riscv_virt_board.ram","size":2147483648}' \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid fd65fc03-8838-4c4d-9d8d-395802488790 \
--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 /var/lib/libvirt/images/riscv64.bbl \
--append root=/dev/vda \
--blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/riscv64.qcow2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
--blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2","file":"libvirt-1-storage"}' \
--device '{"driver":"virtio-blk-pci","bus":"pcie.0","addr":"0x1","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \
--audiodev '{"id":"audio1","driver":"none"}' \
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/riscv64-virt-pci.xml b/tests/qemuxml2argvdata/riscv64-virt-pci.xml
deleted file mode 100644
index c72cd58086..0000000000
--- a/tests/qemuxml2argvdata/riscv64-virt-pci.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<domain type='qemu'>
- <name>riscv64</name>
- <uuid>fd65fc03-8838-4c4d-9d8d-395802488790</uuid>
- <memory unit='KiB'>2097152</memory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='riscv64' machine='virt'>hvm</type>
- <kernel>/var/lib/libvirt/images/riscv64.bbl</kernel>
- <cmdline>root=/dev/vda</cmdline>
- </os>
- <devices>
- <emulator>/usr/bin/qemu-system-riscv64</emulator>
- <disk type='file'>
- <driver name='qemu' type='qcow2'/>
- <source file='/var/lib/libvirt/images/riscv64.qcow2'/>
- <target dev='vda' bus='virtio'/>
- <!-- We need to manually pick an address on pcie.0 because otherwise
- libvirt would try to add pcie-root-ports, and QEMU doesn't support
- PCIe controllers for RISC-V guests yet -->
- <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
- </disk>
- <memballoon model='none'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvdata/riscv64-virt.riscv64-latest.args b/tests/qemuxml2argvdata/riscv64-virt.riscv64-latest.args
deleted file mode 100644
index b3a34272fe..0000000000
--- a/tests/qemuxml2argvdata/riscv64-virt.riscv64-latest.args
+++ /dev/null
@@ -1,38 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-riscv64 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-riscv64/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-riscv64/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-riscv64/.config \
-/usr/bin/qemu-system-riscv64 \
--name guest=riscv64,debug-threads=on \
--S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-riscv64/master-key.aes"}' \
--machine virt,usb=off,dump-guest-core=off,memory-backend=riscv_virt_board.ram \
--accel tcg \
--m size=2097152k \
--object '{"qom-type":"memory-backend-ram","id":"riscv_virt_board.ram","size":2147483648}' \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid fd65fc03-8838-4c4d-9d8d-395802488790 \
--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 /var/lib/libvirt/images/bbl \
--append 'console=ttyS0 ro root=/dev/vda' \
--blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/stage4-disk.img","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-device","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \
--chardev pty,id=charserial0 \
--serial chardev:charserial0 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device '{"driver":"virtio-balloon-device","id":"balloon0"}' \
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/riscv64-virt.xml b/tests/qemuxml2argvdata/riscv64-virt.xml
deleted file mode 100644
index 3a672bdea5..0000000000
--- a/tests/qemuxml2argvdata/riscv64-virt.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<domain type='qemu'>
- <name>riscv64</name>
- <uuid>fd65fc03-8838-4c4d-9d8d-395802488790</uuid>
- <memory unit='KiB'>2097152</memory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='riscv64' machine='virt'>hvm</type>
- <kernel>/var/lib/libvirt/images/bbl</kernel>
- <cmdline>console=ttyS0 ro root=/dev/vda</cmdline>
- </os>
- <devices>
- <emulator>/usr/bin/qemu-system-riscv64</emulator>
- <disk type='file'>
- <source file='/var/lib/libvirt/images/stage4-disk.img'/>
- <target dev='vda' bus='virtio'/>
- </disk>
- <serial type='pty'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 1bc3985aca..fd89dbe649 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2254,16 +2254,6 @@ mymain(void)
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");
-
- /* test default config if pcie bus is not available */
- DO_TEST_FULL("aarch64-virt-virtio", "-MMIO.aarch64.latest",
- ARG_CAPS_ARCH, "aarch64",
- ARG_CAPS_VER, "latest",
- ARG_QEMU_CAPS_DEL,
- QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_LAST, ARG_END);
DO_TEST_CAPS_ARCH_VER("aarch64-virt-virtio", "aarch64", "4.2.0");
DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-virtio", "aarch64");
@@ -2273,7 +2263,6 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-manual-addresses", "aarch64");
DO_TEST_CAPS_ARCH_LATEST("aarch64-video-virtio-gpu-pci", "aarch64");
DO_TEST_CAPS_ARCH_LATEST("aarch64-video-default", "aarch64");
- DO_TEST_CAPS_ARCH_LATEST("aarch64-aavmf-virtio-mmio", "aarch64");
DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-default-nic", "aarch64");
DO_TEST_CAPS_ARCH_LATEST("aarch64-cpu-passthrough", "aarch64");
DO_TEST_GIC("aarch64-gic-none", "4.2.0", GIC_NONE);
@@ -2526,13 +2515,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("vhost-user-fs-hugepages");
DO_TEST_CAPS_LATEST_PARSE_ERROR("vhost-user-fs-readonly");
- /* The generic pcie bridge emulation device can be compiled out of qemu. */
- DO_TEST_CAPS_ARCH_LATEST_FULL("riscv64-virt", "riscv64",
- ARG_QEMU_CAPS_DEL,
- QEMU_CAPS_OBJECT_GPEX,
- QEMU_CAPS_LAST);
- DO_TEST_CAPS_ARCH_LATEST("riscv64-virt-pci", "riscv64");
-
DO_TEST_CAPS_LATEST("virtio-transitional");
DO_TEST_CAPS_LATEST("virtio-non-transitional");
DO_TEST_CAPS_LATEST_PARSE_ERROR("virtio-transitional-not-supported");
diff --git a/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.aarch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.aarch64-latest.xml
deleted file mode 100644
index 634d8ee683..0000000000
--- a/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.aarch64-latest.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<domain type='qemu'>
- <name>aarch64test</name>
- <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
- <memory unit='KiB'>1048576</memory>
- <currentMemory unit='KiB'>1048576</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='aarch64' machine='virt'>hvm</type>
- <kernel>/aarch64.kernel</kernel>
- <initrd>/aarch64.initrd</initrd>
- <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait</cmdline>
- <dtb>/aarch64.dtb</dtb>
- <boot dev='hd'/>
- </os>
- <features>
- <apic/>
- <pae/>
- <gic version='2'/>
- </features>
- <cpu mode='custom' match='exact' check='none'>
- <model fallback='allow'>cortex-a53</model>
- </cpu>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-aarch64</emulator>
- <disk type='file' device='disk'>
- <driver name='qemu' type='raw'/>
- <source file='/aarch64.raw'/>
- <target dev='vda' bus='virtio'/>
- <address type='virtio-mmio'/>
- </disk>
- <controller type='virtio-serial' index='0'>
- <address type='virtio-mmio'/>
- </controller>
- <controller type='pci' index='0' model='pcie-root'/>
- <interface type='user'>
- <mac address='52:54:00:09:a4:37'/>
- <model type='virtio'/>
- <address type='virtio-mmio'/>
- </interface>
- <console type='pty'>
- <target type='virtio' port='0'/>
- </console>
- <audio id='1' type='none'/>
- <memballoon model='virtio'>
- <address type='virtio-mmio'/>
- </memballoon>
- <rng model='virtio'>
- <backend model='random'>/dev/random</backend>
- <address type='virtio-mmio'/>
- </rng>
- </devices>
-</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index c21e34b477..a443f1e87e 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -765,7 +765,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("smbios");
DO_TEST_CAPS_LATEST("smbios-type-fwcfg");
- DO_TEST_CAPS_ARCH_LATEST("aarch64-aavmf-virtio-mmio", "aarch64");
DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-manual-addresses", "aarch64");
DO_TEST_CAPS_ARCH_LATEST("aarch64-video-virtio-gpu-pci", "aarch64");
DO_TEST_CAPS_ARCH_LATEST("aarch64-pci-serial", "aarch64");
@@ -903,9 +902,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("vhost-user-fs-hugepages");
DO_TEST_CAPS_LATEST("vhost-user-fs-sock");
- DO_TEST_CAPS_ARCH_LATEST("riscv64-virt", "riscv64");
- DO_TEST_CAPS_ARCH_LATEST("riscv64-virt-pci", "riscv64");
-
DO_TEST_CAPS_LATEST("x86-kvm-32-on-64");
DO_TEST_CAPS_LATEST("virtio-transitional");
--
2.43.0
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org
On Wed, Jan 17, 2024 at 10:54:39 +0100, Andrea Bolognani wrote:
> All of these are either a subset of other tests, or provide
> coverage for scenarios that are not really possible: for all
> versions of QEMU that we support, the virt machine type has a
> hard dependency on the generic PCIe controller, which means
> that we will never need to fall back to virtio-mmio.
>
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
> ...ch64-aavmf-virtio-mmio.aarch64-latest.args | 46 ---------------
> .../aarch64-aavmf-virtio-mmio.xml | 49 ----------------
> ...rch64-virt-virtio-MMIO.aarch64.latest.args | 48 ----------------
> .../arm-virt-virtio.aarch64-latest.args | 54 ------------------
> tests/qemuxml2argvdata/arm-virt-virtio.xml | 45 ---------------
> .../riscv64-virt-pci.riscv64-latest.args | 35 ------------
> tests/qemuxml2argvdata/riscv64-virt-pci.xml | 24 --------
> .../riscv64-virt.riscv64-latest.args | 38 -------------
> tests/qemuxml2argvdata/riscv64-virt.xml | 19 -------
> tests/qemuxml2argvtest.c | 18 ------
> ...rch64-aavmf-virtio-mmio.aarch64-latest.xml | 56 -------------------
> tests/qemuxml2xmltest.c | 4 --
> 12 files changed, 436 deletions(-)
> delete mode 100644 tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.aarch64-latest.args
> delete mode 100644 tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.xml
> delete mode 100644 tests/qemuxml2argvdata/aarch64-virt-virtio-MMIO.aarch64.latest.args
> delete mode 100644 tests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.args
> delete mode 100644 tests/qemuxml2argvdata/arm-virt-virtio.xml
> delete mode 100644 tests/qemuxml2argvdata/riscv64-virt-pci.riscv64-latest.args
> delete mode 100644 tests/qemuxml2argvdata/riscv64-virt-pci.xml
> delete mode 100644 tests/qemuxml2argvdata/riscv64-virt.riscv64-latest.args
> delete mode 100644 tests/qemuxml2argvdata/riscv64-virt.xml
> delete mode 100644 tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.aarch64-latest.xml
> -
> - /* test default config if pcie bus is not available */
> - DO_TEST_FULL("aarch64-virt-virtio", "-MMIO.aarch64.latest",
> - ARG_CAPS_ARCH, "aarch64",
> - ARG_CAPS_VER, "latest",
> - ARG_QEMU_CAPS_DEL,
> - QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
> - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420,
> - QEMU_CAPS_LAST, ARG_END);
>
> DO_TEST_CAPS_ARCH_VER("aarch64-virt-virtio", "aarch64", "4.2.0");
> DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-virtio", "aarch64");
> @@ -2526,13 +2515,6 @@ mymain(void)
> DO_TEST_CAPS_LATEST("vhost-user-fs-hugepages");
> DO_TEST_CAPS_LATEST_PARSE_ERROR("vhost-user-fs-readonly");
>
> - /* The generic pcie bridge emulation device can be compiled out of qemu. */
> - DO_TEST_CAPS_ARCH_LATEST_FULL("riscv64-virt", "riscv64",
> - ARG_QEMU_CAPS_DEL,
> - QEMU_CAPS_OBJECT_GPEX,
> - QEMU_CAPS_LAST);
I'm not sure about riscv64, but I'm fairly sure we do support non-virt
arm machines and it seems that GPEX can be compiled out if you compile
out that machine.
Arguably that would be an insane configuration and might not be worth
worrying about, but we had tests for it. Would it make sense to switch
to a different machine type?
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org
On Wed, Jan 17, 2024 at 01:18:55PM +0100, Peter Krempa wrote:
> On Wed, Jan 17, 2024 at 10:54:39 +0100, Andrea Bolognani wrote:
> > All of these are either a subset of other tests, or provide
> > coverage for scenarios that are not really possible: for all
> > versions of QEMU that we support, the virt machine type has a
> > hard dependency on the generic PCIe controller, which means
> > that we will never need to fall back to virtio-mmio.
> >
> > - /* test default config if pcie bus is not available */
> > - DO_TEST_FULL("aarch64-virt-virtio", "-MMIO.aarch64.latest",
> > - ARG_CAPS_ARCH, "aarch64",
> > - ARG_CAPS_VER, "latest",
> > - ARG_QEMU_CAPS_DEL,
> > - QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
> > - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420,
> > - QEMU_CAPS_LAST, ARG_END);
> >
> > - /* The generic pcie bridge emulation device can be compiled out of qemu. */
> > - DO_TEST_CAPS_ARCH_LATEST_FULL("riscv64-virt", "riscv64",
> > - ARG_QEMU_CAPS_DEL,
> > - QEMU_CAPS_OBJECT_GPEX,
> > - QEMU_CAPS_LAST);
>
> I'm not sure about riscv64, but I'm fairly sure we do support non-virt
> arm machines and it seems that GPEX can be compiled out if you compile
> out that machine.
You're right in saying that it's possible to obtain a GPEX-less
aarch64 QEMU binary by compiling out the virt machine type.
However, the only way in which we actually use the capability outside
of the test suite is to decide whether the virt machine is capable of
PCI, for which the answer is always "yes".
The remaining usages, in the test suite, are there to confirm that
the virt machine type will fall back to virtio-mmio is PCI is not
available. But that's no longer a scenario that can present itself,
as demonstrated by the fact that we have to go way out of our way to
trick libvirt into behaving that way, so why have coverage?
> Arguably that would be an insane configuration and might not be worth
> worrying about, but we had tests for it. Would it make sense to switch
> to a different machine type?
The original tests were introduced at a time when we still supported
versions of QEMU where the virt machine type wasn't PCI capable. They
made sense at the time, but that's no longer the case today.
With regards to other machine types, we already have some coverage
showing how libvirt handles the absence of PCI support: specifically
arm-vexpressa9-* and disk-arm-virtio-sd. That seems good enough to
me.
--
Andrea Bolognani / Red Hat / Virtualization
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org
On Wed, Jan 17, 2024 at 09:02:12 -0500, Andrea Bolognani wrote:
> On Wed, Jan 17, 2024 at 01:18:55PM +0100, Peter Krempa wrote:
> > On Wed, Jan 17, 2024 at 10:54:39 +0100, Andrea Bolognani wrote:
> > > All of these are either a subset of other tests, or provide
> > > coverage for scenarios that are not really possible: for all
> > > versions of QEMU that we support, the virt machine type has a
> > > hard dependency on the generic PCIe controller, which means
> > > that we will never need to fall back to virtio-mmio.
> > >
> > > - /* test default config if pcie bus is not available */
> > > - DO_TEST_FULL("aarch64-virt-virtio", "-MMIO.aarch64.latest",
> > > - ARG_CAPS_ARCH, "aarch64",
> > > - ARG_CAPS_VER, "latest",
> > > - ARG_QEMU_CAPS_DEL,
> > > - QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
> > > - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420,
> > > - QEMU_CAPS_LAST, ARG_END);
> > >
> > > - /* The generic pcie bridge emulation device can be compiled out of qemu. */
> > > - DO_TEST_CAPS_ARCH_LATEST_FULL("riscv64-virt", "riscv64",
> > > - ARG_QEMU_CAPS_DEL,
> > > - QEMU_CAPS_OBJECT_GPEX,
> > > - QEMU_CAPS_LAST);
> >
> > I'm not sure about riscv64, but I'm fairly sure we do support non-virt
> > arm machines and it seems that GPEX can be compiled out if you compile
> > out that machine.
>
> You're right in saying that it's possible to obtain a GPEX-less
> aarch64 QEMU binary by compiling out the virt machine type.
>
> However, the only way in which we actually use the capability outside
> of the test suite is to decide whether the virt machine is capable of
> PCI, for which the answer is always "yes".
>
> The remaining usages, in the test suite, are there to confirm that
> the virt machine type will fall back to virtio-mmio is PCI is not
> available. But that's no longer a scenario that can present itself,
> as demonstrated by the fact that we have to go way out of our way to
> trick libvirt into behaving that way, so why have coverage?
>
> > Arguably that would be an insane configuration and might not be worth
> > worrying about, but we had tests for it. Would it make sense to switch
> > to a different machine type?
>
> The original tests were introduced at a time when we still supported
> versions of QEMU where the virt machine type wasn't PCI capable. They
> made sense at the time, but that's no longer the case today.
>
> With regards to other machine types, we already have some coverage
> showing how libvirt handles the absence of PCI support: specifically
> arm-vexpressa9-* and disk-arm-virtio-sd. That seems good enough to
> me.
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org
© 2016 - 2025 Red Hat, Inc.