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.
Two of the affected tests explicitly mention the version, so set the machine version for those. For the other two, there's no real requirement to test for a specific machine version either, so just use the latest. Signed-off-by: Fiona Ebner <f.eb...@proxmox.com> --- test/cfg2cmd/q35-simple-6.0.conf | 3 +-- test/cfg2cmd/q35-simple-6.0.conf.cmd | 2 +- test/cfg2cmd/simple-balloon-free-page-reporting.conf | 2 +- test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd | 2 +- test/cfg2cmd/simple-btrfs.conf | 1 - test/cfg2cmd/simple-btrfs.conf.cmd | 4 ++-- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/test/cfg2cmd/q35-simple-6.0.conf b/test/cfg2cmd/q35-simple-6.0.conf index 70426b34..d482dfea 100644 --- a/test/cfg2cmd/q35-simple-6.0.conf +++ b/test/cfg2cmd/q35-simple-6.0.conf @@ -1,10 +1,9 @@ # TEST: Config with q35, Linux & nothing much else but on 6.0 -# QEMU_VERSION: 6.0.0 bios: ovmf bootdisk: scsi0 cores: 2 efidisk0: local:100/vm-100-disk-1.qcow2,size=128K -machine: q35 +machine: pc-q35-6.0 memory: 512 net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0 ostype: l26 diff --git a/test/cfg2cmd/q35-simple-6.0.conf.cmd b/test/cfg2cmd/q35-simple-6.0.conf.cmd index 789c2408..d7860478 100644 --- a/test/cfg2cmd/q35-simple-6.0.conf.cmd +++ b/test/cfg2cmd/q35-simple-6.0.conf.cmd @@ -25,4 +25,4 @@ -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' \ -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-6.0+pve0' diff --git a/test/cfg2cmd/simple-balloon-free-page-reporting.conf b/test/cfg2cmd/simple-balloon-free-page-reporting.conf index e7cd1e4c..ae71eaf6 100644 --- a/test/cfg2cmd/simple-balloon-free-page-reporting.conf +++ b/test/cfg2cmd/simple-balloon-free-page-reporting.conf @@ -1,8 +1,8 @@ # TEST: Simple test for balloon free page reporting enabled by default on 6.2 -# QEMU_VERSION: 6.2 bootdisk: scsi0 cores: 3 ide2: none,media=cdrom +machine: pc-i440fx-6.2 memory: 768 name: simple net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0 diff --git a/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd b/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd index a094704f..097a14e1 100644 --- a/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd +++ b/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd @@ -30,4 +30,4 @@ -device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0,bootindex=100' \ -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:A0,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300' \ - -machine 'type=pc+pve0' + -machine 'type=pc-i440fx-6.2+pve0' diff --git a/test/cfg2cmd/simple-btrfs.conf b/test/cfg2cmd/simple-btrfs.conf index 06503d09..e18d1349 100644 --- a/test/cfg2cmd/simple-btrfs.conf +++ b/test/cfg2cmd/simple-btrfs.conf @@ -1,5 +1,4 @@ # TEST: Simple test for a BTRFS backed VM, which shouldn't use cache=none like other storages -# QEMU_VERSION: 6.0 bootdisk: scsi0 cores: 3 ide2: none,media=cdrom diff --git a/test/cfg2cmd/simple-btrfs.conf.cmd b/test/cfg2cmd/simple-btrfs.conf.cmd index 148e688d..c2354887 100644 --- a/test/cfg2cmd/simple-btrfs.conf.cmd +++ b/test/cfg2cmd/simple-btrfs.conf.cmd @@ -21,7 +21,7 @@ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ - -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3' \ + -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \ -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ -drive 'if=none,id=drive-ide2,media=cdrom,aio=io_uring' \ -device 'ide-cd,bus=ide.1,unit=0,drive=drive-ide2,id=ide2,bootindex=200' \ @@ -29,5 +29,5 @@ -drive 'file=/butter/bread/images/8006/vm-8006-disk-0/disk.raw,if=none,id=drive-scsi0,discard=on,format=raw,aio=io_uring,detect-zeroes=unmap' \ -device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0,bootindex=100' \ -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:A0,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300' \ + -device 'virtio-net-pci,mac=A2:C0:43:77:08:A0,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256,bootindex=300' \ -machine 'type=pc+pve0' -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
