From: Peter Krempa <pkrempa@redhat.com> In the upcoming qemu-10.2 release the 'virt-4.2' machine type will be removed. To preserve the spirit of the test pin the existing test to qemu-10.0 and add a new version using 'virt-10.0' machine type. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...ault-cpu-kvm-virt-10.0.aarch64-latest.args | 35 ++++++++++++++++ ...fault-cpu-kvm-virt-10.0.aarch64-latest.xml | 39 +++++++++++++++++ .../aarch64-default-cpu-kvm-virt-10.0.xml | 20 +++++++++ ...ault-cpu-kvm-virt-4.2.aarch64-10.0.0.args} | 0 ...fault-cpu-kvm-virt-4.2.aarch64-10.0.0.xml} | 0 ...ault-cpu-tcg-virt-10.0.aarch64-latest.args | 36 ++++++++++++++++ ...fault-cpu-tcg-virt-10.0.aarch64-latest.xml | 42 +++++++++++++++++++ .../aarch64-default-cpu-tcg-virt-10.0.xml | 20 +++++++++ ...ault-cpu-tcg-virt-4.2.aarch64-10.0.0.args} | 0 ...fault-cpu-tcg-virt-4.2.aarch64-10.0.0.xml} | 0 tests/qemuxmlconftest.c | 6 ++- 11 files changed, 196 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-10.0.aarch64-latest.args create mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-10.0.aarch64-latest.xml create mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-10.0.xml rename tests/qemuxmlconfdata/{aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args => aarch64-default-cpu-kvm-virt-4.2.aarch64-10.0.0.args} (100%) rename tests/qemuxmlconfdata/{aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.xml => aarch64-default-cpu-kvm-virt-4.2.aarch64-10.0.0.xml} (100%) create mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-10.0.aarch64-latest.args create mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-10.0.aarch64-latest.xml create mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-10.0.xml rename tests/qemuxmlconfdata/{aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args => aarch64-default-cpu-tcg-virt-4.2.aarch64-10.0.0.args} (100%) rename tests/qemuxmlconfdata/{aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.xml => aarch64-default-cpu-tcg-virt-4.2.aarch64-10.0.0.xml} (100%) diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-10.0.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-10.0.aarch64-latest.args new file mode 100644 index 0000000000..7fa72f429e --- /dev/null +++ b/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-10.0.aarch64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-guest \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=guest,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine virt-10.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-accel kvm \ +-m size=4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294967296}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-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 \ +-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"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.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":"pci.1","addr":"0x0","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/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-10.0.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-10.0.aarch64-latest.xml new file mode 100644 index 0000000000..e8cf2fa273 --- /dev/null +++ b/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-10.0.aarch64-latest.xml @@ -0,0 +1,39 @@ +<domain type='kvm'> + <name>guest</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt-10.0'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <gic version='3'/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/guest.qcow2'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> + </disk> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='pcie-root-port'> + <model name='pcie-root-port'/> + <target chassis='1' port='0x8'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/> + </controller> + <controller type='pci' index='2' model='pcie-root-port'> + <model name='pcie-root-port'/> + <target chassis='2' port='0x9'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <audio id='1' type='none'/> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-10.0.xml b/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-10.0.xml new file mode 100644 index 0000000000..ecf9228bc2 --- /dev/null +++ b/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-10.0.xml @@ -0,0 +1,20 @@ +<domain type='kvm'> + <name>guest</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory>4194304</memory> + <currentMemory>4194304</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='aarch64' machine='virt-10.0'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/guest.qcow2'/> + <target dev='vda' bus='virtio'/> + </disk> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-10.0.0.args similarity index 100% rename from tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-10.0.0.args diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-10.0.0.xml similarity index 100% rename from tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.xml rename to tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-10.0.0.xml diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-10.0.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-10.0.aarch64-latest.args new file mode 100644 index 0000000000..2dfeac0adb --- /dev/null +++ b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-10.0.aarch64-latest.args @@ -0,0 +1,36 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-guest \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=guest,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine virt-10.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-accel tcg \ +-cpu cortex-a15 \ +-m size=4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294967296}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-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 \ +-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"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.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":"pci.1","addr":"0x0","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/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-10.0.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-10.0.aarch64-latest.xml new file mode 100644 index 0000000000..e479f0d1d0 --- /dev/null +++ b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-10.0.aarch64-latest.xml @@ -0,0 +1,42 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt-10.0'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <gic version='2'/> + </features> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>cortex-a15</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/guest.qcow2'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> + </disk> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='pcie-root-port'> + <model name='pcie-root-port'/> + <target chassis='1' port='0x8'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/> + </controller> + <controller type='pci' index='2' model='pcie-root-port'> + <model name='pcie-root-port'/> + <target chassis='2' port='0x9'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <audio id='1' type='none'/> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-10.0.xml b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-10.0.xml new file mode 100644 index 0000000000..e48dd1d22e --- /dev/null +++ b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-10.0.xml @@ -0,0 +1,20 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory>4194304</memory> + <currentMemory>4194304</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='aarch64' machine='virt-10.0'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/guest.qcow2'/> + <target dev='vda' bus='virtio'/> + </disk> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-10.0.0.args similarity index 100% rename from tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-10.0.0.args diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-10.0.0.xml similarity index 100% rename from tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.xml rename to tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-10.0.0.xml diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index e853e9e4a3..89afd697b7 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -3185,8 +3185,10 @@ mymain(void) DO_TEST_CAPS_LATEST("cpu-Icelake-Server-pconfig"); - DO_TEST_CAPS_ARCH_LATEST("aarch64-default-cpu-kvm-virt-4.2", "aarch64"); - DO_TEST_CAPS_ARCH_LATEST("aarch64-default-cpu-tcg-virt-4.2", "aarch64"); + DO_TEST_CAPS_ARCH_VER("aarch64-default-cpu-kvm-virt-4.2", "aarch64", "10.0.0"); + DO_TEST_CAPS_ARCH_LATEST("aarch64-default-cpu-kvm-virt-10.0", "aarch64"); + DO_TEST_CAPS_ARCH_VER("aarch64-default-cpu-tcg-virt-4.2", "aarch64", "10.0.0"); + DO_TEST_CAPS_ARCH_LATEST("aarch64-default-cpu-tcg-virt-10.0", "aarch64"); DO_TEST_CAPS_ARCH_VER("ppc64-default-cpu-kvm-pseries-2.7", "ppc64", "7.0.0"); DO_TEST_CAPS_ARCH_VER("ppc64-default-cpu-tcg-pseries-2.7", "ppc64", "7.0.0"); DO_TEST_CAPS_ARCH_LATEST("ppc64-default-cpu-kvm-pseries-3.1", "ppc64"); -- 2.51.1