public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu-server 05/10] test: cfg2cmd: don't use QEMU binary version less than 5.0 for tests
Date: Tue, 23 Jul 2024 17:25:43 +0200	[thread overview]
Message-ID: <20240723152548.129832-6-f.ebner@proxmox.com> (raw)
In-Reply-To: <20240723152548.129832-1-f.ebner@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.

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>
---
 test/cfg2cmd/q35-usb13-error.conf       | 3 +--
 test/cfg2cmd/q35-usb2.conf              | 3 +--
 test/cfg2cmd/q35-usb2.conf.cmd          | 2 +-
 test/cfg2cmd/q35-usb3.conf              | 3 +--
 test/cfg2cmd/q35-usb3.conf.cmd          | 2 +-
 test/cfg2cmd/spice-enhancments.conf     | 2 +-
 test/cfg2cmd/spice-enhancments.conf.cmd | 2 +-
 test/cfg2cmd/spice-linux-4.1.conf       | 2 +-
 test/cfg2cmd/spice-linux-4.1.conf.cmd   | 2 +-
 test/cfg2cmd/spice-usb3.conf            | 2 +-
 test/cfg2cmd/spice-usb3.conf.cmd        | 2 +-
 test/cfg2cmd/spice-win.conf             | 2 +-
 test/cfg2cmd/spice-win.conf.cmd         | 2 +-
 test/cfg2cmd/usb13-error.conf           | 2 +-
 14 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/test/cfg2cmd/q35-usb13-error.conf b/test/cfg2cmd/q35-usb13-error.conf
index a9c25eb4..4777902b 100644
--- a/test/cfg2cmd/q35-usb13-error.conf
+++ b/test/cfg2cmd/q35-usb13-error.conf
@@ -1,12 +1,11 @@
 # 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
 cores: 2
 memory: 768
 name: q35-usb3-error
 net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0
 ostype: l26
-machine: q35
+machine: pc-q35-4.0
 scsihw: virtio-scsi-pci
 smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
 vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8
diff --git a/test/cfg2cmd/q35-usb2.conf b/test/cfg2cmd/q35-usb2.conf
index 4d9b28a7..b106b9e8 100644
--- a/test/cfg2cmd/q35-usb2.conf
+++ b/test/cfg2cmd/q35-usb2.conf
@@ -1,11 +1,10 @@
 # TEST: Test Q35 USB2 passthrough combination
-# QEMU_VERSION: 4.0.0
 cores: 2
 memory: 768
 name: q35-usb2
 net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0
 ostype: l26
-machine: q35
+machine: pc-q35-4.0
 scsihw: virtio-scsi-pci
 smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
 vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8
diff --git a/test/cfg2cmd/q35-usb2.conf.cmd b/test/cfg2cmd/q35-usb2.conf.cmd
index 825f27f8..c5430437 100644
--- a/test/cfg2cmd/q35-usb2.conf.cmd
+++ b/test/cfg2cmd/q35-usb2.conf.cmd
@@ -28,4 +28,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,bootindex=300' \
-  -machine 'type=q35'
+  -machine 'type=pc-q35-4.0+pve0'
diff --git a/test/cfg2cmd/q35-usb3.conf b/test/cfg2cmd/q35-usb3.conf
index 1046e0e3..3e405919 100644
--- a/test/cfg2cmd/q35-usb3.conf
+++ b/test/cfg2cmd/q35-usb3.conf
@@ -1,11 +1,10 @@
 # TEST: Test Q35 USB3 passthrough combination
-# QEMU_VERSION: 4.0.0
 cores: 2
 memory: 768
 name: q35-usb3
 net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0
 ostype: l26
-machine: q35
+machine: pc-q35-4.0
 scsihw: virtio-scsi-pci
 smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
 vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8
diff --git a/test/cfg2cmd/q35-usb3.conf.cmd b/test/cfg2cmd/q35-usb3.conf.cmd
index 956481f3..0286fa40 100644
--- a/test/cfg2cmd/q35-usb3.conf.cmd
+++ b/test/cfg2cmd/q35-usb3.conf.cmd
@@ -29,4 +29,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,bootindex=300' \
-  -machine 'type=q35'
+  -machine 'type=pc-q35-4.0+pve0'
diff --git a/test/cfg2cmd/spice-enhancments.conf b/test/cfg2cmd/spice-enhancments.conf
index 3d5dbb64..895565c8 100644
--- a/test/cfg2cmd/spice-enhancments.conf
+++ b/test/cfg2cmd/spice-enhancments.conf
@@ -1,5 +1,5 @@
 # TEST: Test for SPICE enhancements
-# QEMU_VERSION: 4.0.1
+machine: pc-i440fx-4.0
 smbios1: uuid=363a6126-5f48-43e1-811f-013294a946a0
 spice_enhancements: foldersharing=1,videostreaming=all
 vga: qxl
diff --git a/test/cfg2cmd/spice-enhancments.conf.cmd b/test/cfg2cmd/spice-enhancments.conf.cmd
index 81acdcc9..1219d320 100644
--- a/test/cfg2cmd/spice-enhancments.conf.cmd
+++ b/test/cfg2cmd/spice-enhancments.conf.cmd
@@ -28,4 +28,4 @@
   -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' \
   -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
-  -machine 'type=pc'
+  -machine 'type=pc-i440fx-4.0+pve0'
diff --git a/test/cfg2cmd/spice-linux-4.1.conf b/test/cfg2cmd/spice-linux-4.1.conf
index e484a94b..e72cbe67 100644
--- a/test/cfg2cmd/spice-linux-4.1.conf
+++ b/test/cfg2cmd/spice-linux-4.1.conf
@@ -1,6 +1,6 @@
 # TEST: Test for SPICE with SPICE with max_outputs
-# QEMU_VERSION: 4.1.1
 cores: 2
+machine: pc-i440fx-4.1
 memory: 768
 name: spicelinux
 net0: virtio=A2:C0:43:67:08:A1,bridge=vmbr0
diff --git a/test/cfg2cmd/spice-linux-4.1.conf.cmd b/test/cfg2cmd/spice-linux-4.1.conf.cmd
index e4a60a76..dd7e44e6 100644
--- a/test/cfg2cmd/spice-linux-4.1.conf.cmd
+++ b/test/cfg2cmd/spice-linux-4.1.conf.cmd
@@ -28,4 +28,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: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'
diff --git a/test/cfg2cmd/spice-usb3.conf b/test/cfg2cmd/spice-usb3.conf
index 44ab6e04..40d0dfb7 100644
--- a/test/cfg2cmd/spice-usb3.conf
+++ b/test/cfg2cmd/spice-usb3.conf
@@ -1,6 +1,6 @@
 # TEST: Test for SPICE with a USB3 based SPICE port added
-# QEMU_VERSION: 4.0.0
 cores: 2
+machine: pc-i440fx-4.0
 memory: 768
 name: spiceusb3
 net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0
diff --git a/test/cfg2cmd/spice-usb3.conf.cmd b/test/cfg2cmd/spice-usb3.conf.cmd
index ab35b297..312fee4b 100644
--- a/test/cfg2cmd/spice-usb3.conf.cmd
+++ b/test/cfg2cmd/spice-usb3.conf.cmd
@@ -31,4 +31,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,bootindex=300' \
-  -machine 'type=pc'
+  -machine 'type=pc-i440fx-4.0+pve0'
diff --git a/test/cfg2cmd/spice-win.conf b/test/cfg2cmd/spice-win.conf
index bf43c6ea..67fb7bc7 100644
--- a/test/cfg2cmd/spice-win.conf
+++ b/test/cfg2cmd/spice-win.conf
@@ -1,6 +1,6 @@
 # TEST: Test for SPICE under Win10 with a USB3 based SPICE port added
-# QEMU_VERSION: 4.0.0
 cores: 2
+machine: pc-i440fx-4.0
 memory: 768
 name: spiceusb3
 net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0
diff --git a/test/cfg2cmd/spice-win.conf.cmd b/test/cfg2cmd/spice-win.conf.cmd
index f12c0357..7663522e 100644
--- a/test/cfg2cmd/spice-win.conf.cmd
+++ b/test/cfg2cmd/spice-win.conf.cmd
@@ -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' \
   -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' \
-  -machine 'hpet=off,type=pc-i440fx-4.0' \
+  -machine 'hpet=off,type=pc-i440fx-4.0+pve0' \
   -global 'kvm-pit.lost_tick_policy=discard'
diff --git a/test/cfg2cmd/usb13-error.conf b/test/cfg2cmd/usb13-error.conf
index 48dedc3e..257be94f 100644
--- a/test/cfg2cmd/usb13-error.conf
+++ b/test/cfg2cmd/usb13-error.conf
@@ -1,7 +1,7 @@
 # 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
 cores: 2
+machine: pc-i440fx-4.0
 memory: 768
 name: q35-usb3-error
 net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0
-- 
2.39.2



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel


  parent reply	other threads:[~2024-07-23 15:26 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-23 15:25 [pve-devel] [PATCH-SERIES qemu-server] cfg2cmd: bump minimum binary version to 5.0 and test for QEMU machine version instead of binary version Fiona Ebner
2024-07-23 15:25 ` [pve-devel] [PATCH qemu-server 01/10] code cleanup: drop unused parameter from get_vm_machine() Fiona Ebner
2024-07-23 15:25 ` [pve-devel] [PATCH qemu-server 02/10] test: bump QEMU version in tests for too new machine type and pve version Fiona Ebner
2024-09-06 14:36   ` Daniel Kral
2024-07-23 15:25 ` [pve-devel] [PATCH qemu-server 03/10] test: cfg2cmd: don't use QEMU binary version less than 4.0 for tests Fiona Ebner
2024-09-06 14:37   ` Daniel Kral
2024-07-23 15:25 ` [pve-devel] [PATCH qemu-server 04/10] cfg2cmd: require at least QEMU binary version 4.0 Fiona Ebner
2024-07-23 15:25 ` Fiona Ebner [this message]
2024-07-23 15:25 ` [pve-devel] [PATCH qemu-server 06/10] cfg2cmd: require at least QEMU binary version 5.0 Fiona Ebner
2024-07-23 15:25 ` [pve-devel] [PATCH qemu-server 07/10] cfg2cmd: drop superfluous check for QEMU binary version 4.1 Fiona Ebner
2024-07-23 15:25 ` [pve-devel] [PATCH qemu-server 08/10] test: cfg2cmd: don't use QEMU binary version less than 6.0 for tests Fiona Ebner
2024-07-23 15:25 ` [pve-devel] [PATCH qemu-server 09/10] test: cfg2cmd: don't use QEMU binary version less than 7.0 " Fiona Ebner
2024-07-23 15:25 ` [pve-devel] [PATCH qemu-server 10/10] test: cfg2cmd: don't use QEMU binary version less than 8.0 " Fiona Ebner
2024-09-06 14:39   ` Daniel Kral
2024-09-09  7:42     ` Fiona Ebner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240723152548.129832-6-f.ebner@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal