proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-19 21:07:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test: cfg2cmd: don't use QEMU binary version less than 8.0 for tests

Browse Source 
Since there are certain checks that depend on the QEMU binary version,
tests with a fixed QEMU binary version make it less likely to catch
issues on current setups, because for those, the QEMU binary version
will always be higher than in the tests.

Some of the affected tests explicitly mention the version, so set the
machine version for those. For the others, there's no real requirement
to test for a specific machine version either, so just use the latest.

This completes the transition for using machine version for tests
instead of QEMU binary version. The three remaining tests that set the
binary version explicitly want to test for it.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
Reviewed-by: Daniel Kral <d.kral@proxmox.com>
Tested-by: Daniel Kral <d.kral@proxmox.com>
This commit is contained in:
Fiona Ebner 2024-07-23 17:25:48 +02:00 committed by Thomas Lamprecht
parent ac7c615b50
commit 2dc870b627
11 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/cfg2cmd/cputype-icelake-client-deprecation.conf
View File

@ -1,5 +1,4 @@
# TEST: test CPU type depreacation for Icelake-Client (never existed in the wild) # TEST: test CPU type depreacation for Icelake-Client (never existed in the wild)
# QEMU_VERSION: 7.1
bootdisk: scsi0 bootdisk: scsi0
cores: 2 cores: 2
cpu: Icelake-Client cpu: Icelake-Client

2
test/cfg2cmd/netdev-7.0-multiqueues.conf
View File

@ -1,7 +1,7 @@
# TEST: Simple test for netdev multi queue on 7.0 machine version # TEST: Simple test for netdev multi queue on 7.0 machine version
# QEMU_VERSION: 7.0
bootdisk: scsi0 bootdisk: scsi0
cores: 3 cores: 3
machine: pc-i440fx-7.0
memory: 768 memory: 768
name: netdev-multiq name: netdev-multiq
net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0,mtu=900,queues=2 net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0,mtu=900,queues=2

2
test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd
View File

@ -24,4 +24,4 @@
-iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
-netdev 'type=tap,id=net0,ifname=tap8006i0,script=/var/lib/qemu-server/pve-bridge,downscript=/var/lib/qemu-server/pve-bridgedown,vhost=on,queues=2' \ -netdev 'type=tap,id=net0,ifname=tap8006i0,script=/var/lib/qemu-server/pve-bridge,downscript=/var/lib/qemu-server/pve-bridgedown,vhost=on,queues=2' \
-device 'virtio-net-pci,mac=A2:C0:43:77:08:A0,netdev=net0,bus=pci.0,addr=0x12,id=net0,vectors=6,mq=on,bootindex=300,host_mtu=900' \ -device 'virtio-net-pci,mac=A2:C0:43:77:08:A0,netdev=net0,bus=pci.0,addr=0x12,id=net0,vectors=6,mq=on,bootindex=300,host_mtu=900' \
-machine 'type=pc+pve0' -machine 'type=pc-i440fx-7.0+pve0'

1
test/cfg2cmd/netdev-7.1-multiqueues.conf
View File

@ -1,5 +1,4 @@
# TEST: Simple test for netdev related stuff # TEST: Simple test for netdev related stuff
# QEMU_VERSION: 7.1
bootdisk: scsi0 bootdisk: scsi0
cores: 3 cores: 3
memory: 768 memory: 768

1
test/cfg2cmd/netdev-7.1.conf
View File

@ -1,5 +1,4 @@
# TEST: Simple test for netdev related stuff # TEST: Simple test for netdev related stuff
# QEMU_VERSION: 7.1
bootdisk: scsi0 bootdisk: scsi0
cores: 3 cores: 3
memory: 768 memory: 768

1
test/cfg2cmd/ostype-usb13-error.conf
View File

@ -1,5 +1,4 @@
# TEST: Test error for old ostype type with newer usb config # TEST: Test error for old ostype type with newer usb config
# QEMU_VERSION: 7.1.0
# EXPECT_ERROR: using usb13 is only possible with machine type >= 7.1 and ostype l26 or windows > 7 # EXPECT_ERROR: using usb13 is only possible with machine type >= 7.1 and ostype l26 or windows > 7
cores: 2 cores: 2
memory: 768 memory: 768

3
test/cfg2cmd/q35-simple-7.0.conf
View File

@ -1,10 +1,9 @@
# TEST: Config with q35, Linux & nothing much else but on 7.0 # TEST: Config with q35, Linux & nothing much else but on 7.0
# QEMU_VERSION: 7.0.0
bios: ovmf bios: ovmf
bootdisk: scsi0 bootdisk: scsi0
cores: 2 cores: 2
efidisk0: local:100/vm-100-disk-1.qcow2,size=128K efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
machine: q35 machine: pc-q35-7.0
meta: creation-qemu=6.1 meta: creation-qemu=6.1
memory: 512 memory: 512
net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0 net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0

2
test/cfg2cmd/q35-simple-7.0.conf.cmd
View File

@ -25,4 +25,4 @@
-iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
-netdev 'type=tap,id=net0,ifname=tap8006i0,script=/var/lib/qemu-server/pve-bridge,downscript=/var/lib/qemu-server/pve-bridgedown,vhost=on' \ -netdev 'type=tap,id=net0,ifname=tap8006i0,script=/var/lib/qemu-server/pve-bridge,downscript=/var/lib/qemu-server/pve-bridgedown,vhost=on' \
-device 'virtio-net-pci,mac=2E:01:68:F9:9C:87,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300' \ -device 'virtio-net-pci,mac=2E:01:68:F9:9C:87,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300' \
-machine 'type=q35+pve0' -machine 'type=pc-q35-7.0+pve0'

2
test/cfg2cmd/qemu-xhci-7.1.conf
View File

@ -1,6 +1,6 @@
# TEST: Test for new xhci controller with new machine version # TEST: Test for new xhci controller with new machine version
# QEMU_VERSION: 7.1.0
cores: 2 cores: 2
machine: pc-i440fx-7.1
memory: 768 memory: 768
name: spiceusb3 name: spiceusb3
net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0 net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0

2
test/cfg2cmd/qemu-xhci-7.1.conf.cmd
View File

@ -34,4 +34,4 @@
-iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
-netdev 'type=tap,id=net0,ifname=tap8006i0,script=/var/lib/qemu-server/pve-bridge,downscript=/var/lib/qemu-server/pve-bridgedown,vhost=on' \ -netdev 'type=tap,id=net0,ifname=tap8006i0,script=/var/lib/qemu-server/pve-bridge,downscript=/var/lib/qemu-server/pve-bridgedown,vhost=on' \
-device 'virtio-net-pci,mac=A2:C0:43:77:08:A1,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256,bootindex=300' \ -device 'virtio-net-pci,mac=A2:C0:43:77:08:A1,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256,bootindex=300' \
-machine 'type=pc+pve0' -machine 'type=pc-i440fx-7.1+pve0'

1
test/cfg2cmd/qemu-xhci-q35-7.1.conf
View File

@ -1,5 +1,4 @@
# TEST: Test Q35 USB passthrough combination with qemu-xhci # TEST: Test Q35 USB passthrough combination with qemu-xhci
# QEMU_VERSION: 7.1.0
cores: 2 cores: 2
memory: 768 memory: 768
name: q35-qemu-xhci name: q35-qemu-xhci