From 83f18ac089acc032a6460488e4c8ea4399e6218f Mon Sep 17 00:00:00 2001 From: Fiona Ebner Date: Tue, 23 Jul 2024 17:25:41 +0200 Subject: [PATCH] test: cfg2cmd: don't use QEMU binary version less than 4.0 for tests 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. For the affected tests, there's no real requirement to test for a specific machine version either, so just use the latest. Signed-off-by: Fiona Ebner Reviewed-by: Daniel Kral Tested-by: Daniel Kral --- test/cfg2cmd/memory-hotplug-hugepages.conf | 3 +-- test/cfg2cmd/memory-hotplug-hugepages.conf.cmd | 4 ++-- test/cfg2cmd/memory-hotplug.conf | 1 - test/cfg2cmd/memory-hotplug.conf.cmd | 4 ++-- test/cfg2cmd/memory-hugepages-1g.conf | 3 +-- test/cfg2cmd/memory-hugepages-1g.conf.cmd | 4 ++-- test/cfg2cmd/memory-hugepages-2m.conf | 3 +-- test/cfg2cmd/memory-hugepages-2m.conf.cmd | 4 ++-- test/cfg2cmd/simple1-template.conf | 1 - test/cfg2cmd/simple1-template.conf.cmd | 10 +++++----- test/cfg2cmd/simple1.conf | 1 - test/cfg2cmd/simple1.conf.cmd | 10 +++++----- 12 files changed, 21 insertions(+), 27 deletions(-) diff --git a/test/cfg2cmd/memory-hotplug-hugepages.conf b/test/cfg2cmd/memory-hotplug-hugepages.conf index 6cba31ea..1c9d89e4 100644 --- a/test/cfg2cmd/memory-hotplug-hugepages.conf +++ b/test/cfg2cmd/memory-hotplug-hugepages.conf @@ -1,5 +1,4 @@ # TEST: memory hotplug with 1GB hugepage -# QEMU_VERSION: 3.0 cores: 2 memory: 18432 name: simple @@ -9,4 +8,4 @@ smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465 sockets: 2 vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8 hotplug: memory -hugepages: 1024 \ No newline at end of file +hugepages: 1024 diff --git a/test/cfg2cmd/memory-hotplug-hugepages.conf.cmd b/test/cfg2cmd/memory-hotplug-hugepages.conf.cmd index 6d4d8e84..f8a8bcb7 100644 --- a/test/cfg2cmd/memory-hotplug-hugepages.conf.cmd +++ b/test/cfg2cmd/memory-hotplug-hugepages.conf.cmd @@ -57,6 +57,6 @@ -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' \ - -machine 'type=pc' + -machine 'type=pc+pve0' diff --git a/test/cfg2cmd/memory-hotplug.conf b/test/cfg2cmd/memory-hotplug.conf index 386e61fd..1388a35e 100644 --- a/test/cfg2cmd/memory-hotplug.conf +++ b/test/cfg2cmd/memory-hotplug.conf @@ -1,5 +1,4 @@ # TEST: basic memory hotplug -# QEMU_VERSION: 3.0 cores: 2 memory: 66560 name: simple diff --git a/test/cfg2cmd/memory-hotplug.conf.cmd b/test/cfg2cmd/memory-hotplug.conf.cmd index 107435d0..859c889d 100644 --- a/test/cfg2cmd/memory-hotplug.conf.cmd +++ b/test/cfg2cmd/memory-hotplug.conf.cmd @@ -169,6 +169,6 @@ -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' \ - -machine 'type=pc' + -machine 'type=pc+pve0' diff --git a/test/cfg2cmd/memory-hugepages-1g.conf b/test/cfg2cmd/memory-hugepages-1g.conf index 8db2cca6..567a24d9 100644 --- a/test/cfg2cmd/memory-hugepages-1g.conf +++ b/test/cfg2cmd/memory-hugepages-1g.conf @@ -1,5 +1,4 @@ # TEST: memory wih 1gb hugepages -# QEMU_VERSION: 3.0 cores: 2 memory: 8192 name: simple @@ -8,4 +7,4 @@ ostype: l26 smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465 sockets: 2 vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8 -hugepages: 1024 \ No newline at end of file +hugepages: 1024 diff --git a/test/cfg2cmd/memory-hugepages-1g.conf.cmd b/test/cfg2cmd/memory-hugepages-1g.conf.cmd index 63792d27..352242c4 100644 --- a/test/cfg2cmd/memory-hugepages-1g.conf.cmd +++ b/test/cfg2cmd/memory-hugepages-1g.conf.cmd @@ -25,6 +25,6 @@ -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' \ - -machine 'type=pc' + -machine 'type=pc+pve0' diff --git a/test/cfg2cmd/memory-hugepages-2m.conf b/test/cfg2cmd/memory-hugepages-2m.conf index f0d65fbd..50d53f0d 100644 --- a/test/cfg2cmd/memory-hugepages-2m.conf +++ b/test/cfg2cmd/memory-hugepages-2m.conf @@ -1,5 +1,4 @@ # TEST: memory wih 2mb hugepages -# QEMU_VERSION: 3.0 cores: 2 memory: 8192 name: simple @@ -8,4 +7,4 @@ ostype: l26 smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465 sockets: 2 vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8 -hugepages: 2 \ No newline at end of file +hugepages: 2 diff --git a/test/cfg2cmd/memory-hugepages-2m.conf.cmd b/test/cfg2cmd/memory-hugepages-2m.conf.cmd index 287c0eda..5594e878 100644 --- a/test/cfg2cmd/memory-hugepages-2m.conf.cmd +++ b/test/cfg2cmd/memory-hugepages-2m.conf.cmd @@ -25,6 +25,6 @@ -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' \ - -machine 'type=pc' + -machine 'type=pc+pve0' diff --git a/test/cfg2cmd/simple1-template.conf b/test/cfg2cmd/simple1-template.conf index c26de400..491aa7d0 100644 --- a/test/cfg2cmd/simple1-template.conf +++ b/test/cfg2cmd/simple1-template.conf @@ -1,5 +1,4 @@ # TEST: Simple test for a basic template configuration -# QEMU_VERSION: 3.0 bootdisk: scsi0 cores: 3 ide2: none,media=cdrom diff --git a/test/cfg2cmd/simple1-template.conf.cmd b/test/cfg2cmd/simple1-template.conf.cmd index e514446c..35484600 100644 --- a/test/cfg2cmd/simple1-template.conf.cmd +++ b/test/cfg2cmd/simple1-template.conf.cmd @@ -19,15 +19,15 @@ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ - -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=threads' \ + -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' \ -device 'virtio-scsi-pci,id=scsihw0,bus=pci.0,addr=0x5' \ - -drive 'file=/var/lib/vz/images/8006/base-8006-disk-1.qcow2,if=none,id=drive-scsi0,discard=on,format=qcow2,cache=none,aio=native,detect-zeroes=unmap,readonly=on' \ + -drive 'file=/var/lib/vz/images/8006/base-8006-disk-1.qcow2,if=none,id=drive-scsi0,discard=on,format=qcow2,cache=none,aio=io_uring,detect-zeroes=unmap,readonly=on' \ -device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0' \ -device 'ahci,id=ahci0,multifunction=on,bus=pci.0,addr=0x7' \ - -drive 'file=/var/lib/vz/images/8006/base-8006-disk-0.qcow2,if=none,id=drive-sata0,discard=on,format=qcow2,cache=none,aio=native,detect-zeroes=unmap' \ + -drive 'file=/var/lib/vz/images/8006/base-8006-disk-0.qcow2,if=none,id=drive-sata0,discard=on,format=qcow2,cache=none,aio=io_uring,detect-zeroes=unmap' \ -device 'ide-hd,bus=ahci0.0,drive=drive-sata0,id=sata0' \ - -machine 'accel=tcg,smm=off,type=pc' \ + -machine 'accel=tcg,smm=off,type=pc+pve0' \ -snapshot diff --git a/test/cfg2cmd/simple1.conf b/test/cfg2cmd/simple1.conf index 16a24023..9feb9d26 100644 --- a/test/cfg2cmd/simple1.conf +++ b/test/cfg2cmd/simple1.conf @@ -1,5 +1,4 @@ # TEST: Simple test for a basic configuration with no special things -# QEMU_VERSION: 3.0 bootdisk: scsi0 cores: 3 ide2: none,media=cdrom diff --git a/test/cfg2cmd/simple1.conf.cmd b/test/cfg2cmd/simple1.conf.cmd index 2b1b185a..ecd14bcc 100644 --- a/test/cfg2cmd/simple1.conf.cmd +++ b/test/cfg2cmd/simple1.conf.cmd @@ -21,13 +21,13 @@ -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=threads' \ + -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' \ -device 'virtio-scsi-pci,id=scsihw0,bus=pci.0,addr=0x5' \ - -drive 'file=/var/lib/vz/images/8006/vm-8006-disk-0.qcow2,if=none,id=drive-scsi0,discard=on,format=qcow2,cache=none,aio=native,detect-zeroes=unmap' \ + -drive 'file=/var/lib/vz/images/8006/vm-8006-disk-0.qcow2,if=none,id=drive-scsi0,discard=on,format=qcow2,cache=none,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' \ - -machine 'type=pc' + -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'