proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-10-04 13:49:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test: cfg2cmd: don't use QEMU binary version less than 5.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.

Set the machine version, because these tests depend on that. The machine
version is what should actually be tested for rather than an old QEMU
binary version.

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:43 +02:00 committed by Thomas Lamprecht
parent 2263b8548d
commit eb88d96432
14 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/cfg2cmd/q35-usb13-error.conf
View File

@ -1,12 +1,11 @@
# TEST: Test usb error for q35 and older machine type # TEST: Test usb error for q35 and older machine type
# QEMU_VERSION: 4.0.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
name: q35-usb3-error name: q35-usb3-error
net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0 net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0
ostype: l26 ostype: l26
machine: q35 machine: pc-q35-4.0
scsihw: virtio-scsi-pci scsihw: virtio-scsi-pci
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465 smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8 vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8

3
test/cfg2cmd/q35-usb2.conf
View File

@ -1,11 +1,10 @@
# TEST: Test Q35 USB2 passthrough combination # TEST: Test Q35 USB2 passthrough combination
# QEMU_VERSION: 4.0.0
cores: 2 cores: 2
memory: 768 memory: 768
name: q35-usb2 name: q35-usb2
net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0 net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0
ostype: l26 ostype: l26
machine: q35 machine: pc-q35-4.0
scsihw: virtio-scsi-pci scsihw: virtio-scsi-pci
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465 smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8 vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8

2
test/cfg2cmd/q35-usb2.conf.cmd
View File

@ -28,4 +28,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,bootindex=300' \ -device 'virtio-net-pci,mac=A2:C0:43:77:08:A1,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300' \
-machine 'type=q35' -machine 'type=pc-q35-4.0+pve0'

3
test/cfg2cmd/q35-usb3.conf
View File

@ -1,11 +1,10 @@
# TEST: Test Q35 USB3 passthrough combination # TEST: Test Q35 USB3 passthrough combination
# QEMU_VERSION: 4.0.0
cores: 2 cores: 2
memory: 768 memory: 768
name: q35-usb3 name: q35-usb3
net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0 net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0
ostype: l26 ostype: l26
machine: q35 machine: pc-q35-4.0
scsihw: virtio-scsi-pci scsihw: virtio-scsi-pci
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465 smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8 vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8

2
test/cfg2cmd/q35-usb3.conf.cmd
View File

@ -29,4 +29,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,bootindex=300' \ -device 'virtio-net-pci,mac=A2:C0:43:77:08:A1,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300' \
-machine 'type=q35' -machine 'type=pc-q35-4.0+pve0'

2
test/cfg2cmd/spice-enhancments.conf
View File

@ -1,5 +1,5 @@
# TEST: Test for SPICE enhancements # TEST: Test for SPICE enhancements
# QEMU_VERSION: 4.0.1 machine: pc-i440fx-4.0
smbios1: uuid=363a6126-5f48-43e1-811f-013294a946a0 smbios1: uuid=363a6126-5f48-43e1-811f-013294a946a0
spice_enhancements: foldersharing=1,videostreaming=all spice_enhancements: foldersharing=1,videostreaming=all
vga: qxl vga: qxl

2
test/cfg2cmd/spice-enhancments.conf.cmd
View File

@ -28,4 +28,4 @@
-spice 'tls-port=61000,addr=127.0.0.1,tls-ciphers=HIGH,seamless-migration=on,streaming-video=all' \ -spice 'tls-port=61000,addr=127.0.0.1,tls-ciphers=HIGH,seamless-migration=on,streaming-video=all' \
-device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3' \ -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3' \
-iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
-machine 'type=pc' -machine 'type=pc-i440fx-4.0+pve0'

2
test/cfg2cmd/spice-linux-4.1.conf
View File

@ -1,6 +1,6 @@
# TEST: Test for SPICE with SPICE with max_outputs # TEST: Test for SPICE with SPICE with max_outputs
# QEMU_VERSION: 4.1.1
cores: 2 cores: 2
machine: pc-i440fx-4.1
memory: 768 memory: 768
name: spicelinux name: spicelinux
net0: virtio=A2:C0:43:67:08:A1,bridge=vmbr0 net0: virtio=A2:C0:43:67:08:A1,bridge=vmbr0

2
test/cfg2cmd/spice-linux-4.1.conf.cmd
View File

@ -28,4 +28,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:67:08:A1,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300' \ -device 'virtio-net-pci,mac=A2:C0:43:67:08:A1,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300' \
-machine 'type=pc+pve0' -machine 'type=pc-i440fx-4.1+pve0'

2
test/cfg2cmd/spice-usb3.conf
View File

@ -1,6 +1,6 @@
# TEST: Test for SPICE with a USB3 based SPICE port added # TEST: Test for SPICE with a USB3 based SPICE port added
# QEMU_VERSION: 4.0.0
cores: 2 cores: 2
machine: pc-i440fx-4.0
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/spice-usb3.conf.cmd
View File

@ -31,4 +31,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,bootindex=300' \ -device 'virtio-net-pci,mac=A2:C0:43:77:08:A1,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300' \
-machine 'type=pc' -machine 'type=pc-i440fx-4.0+pve0'

2
test/cfg2cmd/spice-win.conf
View File

@ -1,6 +1,6 @@
# TEST: Test for SPICE under Win10 with a USB3 based SPICE port added # TEST: Test for SPICE under Win10 with a USB3 based SPICE port added
# QEMU_VERSION: 4.0.0
cores: 2 cores: 2
machine: pc-i440fx-4.0
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/spice-win.conf.cmd
View File

@ -33,5 +33,5 @@
-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,bootindex=300' \ -device 'virtio-net-pci,mac=A2:C0:43:77:08:A1,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300' \
-rtc 'driftfix=slew,base=localtime' \ -rtc 'driftfix=slew,base=localtime' \
-machine 'hpet=off,type=pc-i440fx-4.0' \ -machine 'hpet=off,type=pc-i440fx-4.0+pve0' \
-global 'kvm-pit.lost_tick_policy=discard' -global 'kvm-pit.lost_tick_policy=discard'

2
test/cfg2cmd/usb13-error.conf
View File

@ -1,7 +1,7 @@
# TEST: Test error for old machine type with newer usb config # TEST: Test error for old machine type with newer usb config
# QEMU_VERSION: 4.0.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
machine: pc-i440fx-4.0
memory: 768 memory: 768
name: q35-usb3-error name: q35-usb3-error
net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0 net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0