From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 31CA11FF2CA for <inbox@lore.proxmox.com>; Tue, 23 Jul 2024 17:26:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C41926AE3; Tue, 23 Jul 2024 17:26:30 +0200 (CEST) From: Fiona Ebner <f.ebner@proxmox.com> To: pve-devel@lists.proxmox.com Date: Tue, 23 Jul 2024 17:25:48 +0200 Message-Id: <20240723152548.129832-11-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240723152548.129832-1-f.ebner@proxmox.com> References: <20240723152548.129832-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.061 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH qemu-server 10/10] test: cfg2cmd: don't use QEMU binary version less than 8.0 for tests X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> 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> --- test/cfg2cmd/cputype-icelake-client-deprecation.conf | 1 - test/cfg2cmd/netdev-7.0-multiqueues.conf | 2 +- test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd | 2 +- test/cfg2cmd/netdev-7.1-multiqueues.conf | 1 - test/cfg2cmd/netdev-7.1.conf | 1 - test/cfg2cmd/ostype-usb13-error.conf | 1 - test/cfg2cmd/q35-simple-7.0.conf | 3 +-- test/cfg2cmd/q35-simple-7.0.conf.cmd | 2 +- test/cfg2cmd/qemu-xhci-7.1.conf | 2 +- test/cfg2cmd/qemu-xhci-7.1.conf.cmd | 2 +- test/cfg2cmd/qemu-xhci-q35-7.1.conf | 1 - 11 files changed, 6 insertions(+), 12 deletions(-) diff --git a/test/cfg2cmd/cputype-icelake-client-deprecation.conf b/test/cfg2cmd/cputype-icelake-client-deprecation.conf index 523dd275..2f595162 100644 --- a/test/cfg2cmd/cputype-icelake-client-deprecation.conf +++ b/test/cfg2cmd/cputype-icelake-client-deprecation.conf @@ -1,5 +1,4 @@ # TEST: test CPU type depreacation for Icelake-Client (never existed in the wild) -# QEMU_VERSION: 7.1 bootdisk: scsi0 cores: 2 cpu: Icelake-Client diff --git a/test/cfg2cmd/netdev-7.0-multiqueues.conf b/test/cfg2cmd/netdev-7.0-multiqueues.conf index 342ad886..e55f5c93 100644 --- a/test/cfg2cmd/netdev-7.0-multiqueues.conf +++ b/test/cfg2cmd/netdev-7.0-multiqueues.conf @@ -1,7 +1,7 @@ # TEST: Simple test for netdev multi queue on 7.0 machine version -# QEMU_VERSION: 7.0 bootdisk: scsi0 cores: 3 +machine: pc-i440fx-7.0 memory: 768 name: netdev-multiq net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0,mtu=900,queues=2 diff --git a/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd b/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd index 6892de34..a6f8a827 100644 --- a/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd +++ b/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd @@ -24,4 +24,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,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' \ - -machine 'type=pc+pve0' + -machine 'type=pc-i440fx-7.0+pve0' diff --git a/test/cfg2cmd/netdev-7.1-multiqueues.conf b/test/cfg2cmd/netdev-7.1-multiqueues.conf index da5f111d..162bd9c5 100644 --- a/test/cfg2cmd/netdev-7.1-multiqueues.conf +++ b/test/cfg2cmd/netdev-7.1-multiqueues.conf @@ -1,5 +1,4 @@ # TEST: Simple test for netdev related stuff -# QEMU_VERSION: 7.1 bootdisk: scsi0 cores: 3 memory: 768 diff --git a/test/cfg2cmd/netdev-7.1.conf b/test/cfg2cmd/netdev-7.1.conf index 82be0566..8ae0673e 100644 --- a/test/cfg2cmd/netdev-7.1.conf +++ b/test/cfg2cmd/netdev-7.1.conf @@ -1,5 +1,4 @@ # TEST: Simple test for netdev related stuff -# QEMU_VERSION: 7.1 bootdisk: scsi0 cores: 3 memory: 768 diff --git a/test/cfg2cmd/ostype-usb13-error.conf b/test/cfg2cmd/ostype-usb13-error.conf index 5c75b620..f8e4397d 100644 --- a/test/cfg2cmd/ostype-usb13-error.conf +++ b/test/cfg2cmd/ostype-usb13-error.conf @@ -1,5 +1,4 @@ # 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 cores: 2 memory: 768 diff --git a/test/cfg2cmd/q35-simple-7.0.conf b/test/cfg2cmd/q35-simple-7.0.conf index 4618e23d..9e3097ee 100644 --- a/test/cfg2cmd/q35-simple-7.0.conf +++ b/test/cfg2cmd/q35-simple-7.0.conf @@ -1,10 +1,9 @@ # TEST: Config with q35, Linux & nothing much else but on 7.0 -# QEMU_VERSION: 7.0.0 bios: ovmf bootdisk: scsi0 cores: 2 efidisk0: local:100/vm-100-disk-1.qcow2,size=128K -machine: q35 +machine: pc-q35-7.0 meta: creation-qemu=6.1 memory: 512 net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0 diff --git a/test/cfg2cmd/q35-simple-7.0.conf.cmd b/test/cfg2cmd/q35-simple-7.0.conf.cmd index 9344f5a9..efd57bb7 100644 --- a/test/cfg2cmd/q35-simple-7.0.conf.cmd +++ b/test/cfg2cmd/q35-simple-7.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-7.0+pve0' diff --git a/test/cfg2cmd/qemu-xhci-7.1.conf b/test/cfg2cmd/qemu-xhci-7.1.conf index e7cac65e..b09d37bf 100644 --- a/test/cfg2cmd/qemu-xhci-7.1.conf +++ b/test/cfg2cmd/qemu-xhci-7.1.conf @@ -1,6 +1,6 @@ # TEST: Test for new xhci controller with new machine version -# QEMU_VERSION: 7.1.0 cores: 2 +machine: pc-i440fx-7.1 memory: 768 name: spiceusb3 net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0 diff --git a/test/cfg2cmd/qemu-xhci-7.1.conf.cmd b/test/cfg2cmd/qemu-xhci-7.1.conf.cmd index 2492e57e..fd1456aa 100644 --- a/test/cfg2cmd/qemu-xhci-7.1.conf.cmd +++ b/test/cfg2cmd/qemu-xhci-7.1.conf.cmd @@ -34,4 +34,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=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' diff --git a/test/cfg2cmd/qemu-xhci-q35-7.1.conf b/test/cfg2cmd/qemu-xhci-q35-7.1.conf index 40a59010..7740e54f 100644 --- a/test/cfg2cmd/qemu-xhci-q35-7.1.conf +++ b/test/cfg2cmd/qemu-xhci-q35-7.1.conf @@ -1,5 +1,4 @@ # TEST: Test Q35 USB passthrough combination with qemu-xhci -# QEMU_VERSION: 7.1.0 cores: 2 memory: 768 name: q35-qemu-xhci -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel