[pve-devel] [PATCH-SERIES qemu-server] cfg2cmd: bump minimum binary version to 5.0 and test for QEMU machine version instead of binary version

[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]

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 current setups will always have a
newer QEMU binary version than the test.

There are only three tests that explicitly want to test for the binary
version. All others are better of setting the appropriate machine
version they want to test for or just use the current machine version
if no version-specific feature is tested for.

The minimum binary version that can be used is bumped to 5.0 which was
used in Proxmox VE 6.2, to still allow for long-term regression
testing.

Split into bite-sized pieces for better reviewability.


Fiona Ebner (10):
  code cleanup: drop unused parameter from get_vm_machine()
  test: bump QEMU version in tests for too new machine type and pve
    version
  test: cfg2cmd: don't use QEMU binary version less than 4.0 for tests
  cfg2cmd: require at least QEMU binary version 4.0
  test: cfg2cmd: don't use QEMU binary version less than 5.0 for tests
  cfg2cmd: require at least QEMU binary version 5.0
  cfg2cmd: drop superfluous check for QEMU binary version 4.1
  test: cfg2cmd: don't use QEMU binary version less than 6.0 for tests
  test: cfg2cmd: don't use QEMU binary version less than 7.0 for tests
  test: cfg2cmd: don't use QEMU binary version less than 8.0 for tests

 PVE/QemuServer.pm                             | 26 +++++++------------
 test/cfg2cmd/bootorder-empty.conf             |  1 -
 test/cfg2cmd/bootorder-empty.conf.cmd         | 12 ++++-----
 test/cfg2cmd/bootorder-legacy.conf            |  1 -
 test/cfg2cmd/bootorder-legacy.conf.cmd        | 12 ++++-----
 test/cfg2cmd/bootorder.conf                   |  1 -
 test/cfg2cmd/bootorder.conf.cmd               | 12 ++++-----
 .../cputype-icelake-client-deprecation.conf   |  1 -
 test/cfg2cmd/memory-hotplug-hugepages.conf    |  3 +--
 .../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 +--
 .../minimal-defaults-to-new-machine.conf      |  4 +--
 ...imal-defaults-unsupported-pve-version.conf |  6 ++---
 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/netdev.conf                      |  2 +-
 test/cfg2cmd/netdev.conf.cmd                  |  2 +-
 test/cfg2cmd/old-qemu.conf                    |  4 +--
 test/cfg2cmd/ostype-usb13-error.conf          |  1 -
 test/cfg2cmd/q35-simple-6.0.conf              |  3 +--
 test/cfg2cmd/q35-simple-6.0.conf.cmd          |  2 +-
 test/cfg2cmd/q35-simple-7.0.conf              |  3 +--
 test/cfg2cmd/q35-simple-7.0.conf.cmd          |  2 +-
 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/qemu-xhci-7.1.conf               |  2 +-
 test/cfg2cmd/qemu-xhci-7.1.conf.cmd           |  2 +-
 test/cfg2cmd/qemu-xhci-q35-7.1.conf           |  1 -
 .../simple-balloon-free-page-reporting.conf   |  2 +-
 ...imple-balloon-free-page-reporting.conf.cmd |  2 +-
 test/cfg2cmd/simple-btrfs.conf                |  1 -
 test/cfg2cmd/simple-btrfs.conf.cmd            |  4 +--
 test/cfg2cmd/simple-virtio-blk.conf           |  1 -
 test/cfg2cmd/simple-virtio-blk.conf.cmd       |  8 +++---
 test/cfg2cmd/simple1-template.conf            |  1 -
 test/cfg2cmd/simple1-template.conf.cmd        | 10 +++----
 test/cfg2cmd/simple1.conf                     |  1 -
 test/cfg2cmd/simple1.conf.cmd                 | 10 +++----
 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 +-
 57 files changed, 88 insertions(+), 115 deletions(-)

-- 
2.39.2



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

[pve-devel] [PATCH qemu-server 01/10] code cleanup: drop unused parameter from get_vm_machine()

[Fiona Ebner]

The parameter was added by ac0077cc ("Use 'QEMU version' ->
'+pve-version' mapping for machine types") but it doesn't seem like
there ever was a caller. In particular, none of the current callers
pass in a value and it's not clear when one would require passing a
different version than the KVM binary version.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 PVE/QemuServer.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index bf59b091..65784187 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3253,13 +3253,13 @@ sub windows_get_pinned_machine_version {
 }
 
 sub get_vm_machine {
-    my ($conf, $forcemachine, $arch, $add_pve_version, $kvmversion) = @_;
+    my ($conf, $forcemachine, $arch, $add_pve_version) = @_;
 
     my $machine_conf = PVE::QemuServer::Machine::parse_machine($conf->{machine});
     my $machine = $forcemachine || $machine_conf->{type};
 
     if (!$machine || $machine =~ m/^(?:pc|q35|virt)$/) {
-	$kvmversion //= kvm_user_version();
+	my $kvmversion //= kvm_user_version();
 	# we must pin Windows VMs without a specific version to 5.1, as 5.2 fixed a bug in ACPI
 	# layout which confuses windows quite a bit and may result in various regressions..
 	# see: https://lists.gnu.org/archive/html/qemu-devel/2021-02/msg08484.html
-- 
2.39.2



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

[pve-devel] [PATCH qemu-server 02/10] test: bump QEMU version in tests for too new machine type and pve version

[Fiona Ebner]

This is necessary to bump the minimum required version in
config_to_command() beyond 4.1.1, because otherwise there will be an
error message mismatch making the test fail.

Bump the tests all the way to 9.0.0, because that is the current version
and because then the test doesn't have to be touched again too soon
(only when wishing to bump the minimum required version beyond 9.0.0
in config_to_command()).

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 test/cfg2cmd/minimal-defaults-to-new-machine.conf          | 4 ++--
 test/cfg2cmd/minimal-defaults-unsupported-pve-version.conf | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/cfg2cmd/minimal-defaults-to-new-machine.conf b/test/cfg2cmd/minimal-defaults-to-new-machine.conf
index 35967cfb..f856f243 100644
--- a/test/cfg2cmd/minimal-defaults-to-new-machine.conf
+++ b/test/cfg2cmd/minimal-defaults-to-new-machine.conf
@@ -1,5 +1,5 @@
 # TEST: newer machine verison than QEMU version installed on node
-# QEMU_VERSION: 4.1.1
-# EXPECT_ERROR: Installed QEMU version '4.1.1' is too old to run machine type 'pc-q35-42.9+pve0', please upgrade node 'localhost'
+# QEMU_VERSION: 9.0.0
+# EXPECT_ERROR: Installed QEMU version '9.0.0' is too old to run machine type 'pc-q35-42.9+pve0', please upgrade node 'localhost'
 smbios1: uuid=6cf17dc3-8341-4ecc-aebd-7503f2583fb3
 machine: pc-q35-42.9
diff --git a/test/cfg2cmd/minimal-defaults-unsupported-pve-version.conf b/test/cfg2cmd/minimal-defaults-unsupported-pve-version.conf
index 87e7a076..f0f5cc33 100644
--- a/test/cfg2cmd/minimal-defaults-unsupported-pve-version.conf
+++ b/test/cfg2cmd/minimal-defaults-unsupported-pve-version.conf
@@ -1,5 +1,5 @@
 # TEST: newer machine verison than QEMU version installed on node
-# QEMU_VERSION: 4.1.1
-# EXPECT_ERROR: Installed qemu-server (max feature level for 4.0 is pve0) is too old to run machine type 'pc-q35-4.0+pve77', please upgrade node 'localhost'
+# QEMU_VERSION: 9.0.0
+# EXPECT_ERROR: Installed qemu-server (max feature level for 9.0 is pve0) is too old to run machine type 'pc-q35-9.0+pve77', please upgrade node 'localhost'
 smbios1: uuid=6cf17dc3-8341-4ecc-aebd-7503f2583fb3
-machine: pc-q35-4.0+pve77
+machine: pc-q35-9.0+pve77
-- 
2.39.2



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

Re: [pve-devel] [PATCH qemu-server 02/10] test: bump QEMU version in tests for too new machine type and pve version

[Daniel Kral]

On Tue, 23 Jul 2024 17:25:40 +0200, Fiona Ebner wrote:
> --- a/test/cfg2cmd/minimal-defaults-to-new-machine.conf
> +++ b/test/cfg2cmd/minimal-defaults-to-new-machine.conf
> @@ -1,5 +1,5 @@
>  # TEST: newer machine verison than QEMU version installed on node

and

On Tue, 23 Jul 2024 17:25:40 +0200, Fiona Ebner wrote:
> --- a/test/cfg2cmd/minimal-defaults-unsupported-pve-version.conf
> +++ b/test/cfg2cmd/minimal-defaults-unsupported-pve-version.conf
> @@ -1,5 +1,5 @@
>  # TEST: newer machine verison than QEMU version installed on node

contain the same minor misspelling that could be fixed when we're there:
s/verison/version

Otherwise:

Reviewed-by: Daniel Kral <d.kral@proxmox.com>


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

[pve-devel] [PATCH qemu-server 03/10] test: cfg2cmd: don't use QEMU binary version less than 4.0 for tests

[Fiona Ebner]

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 <f.ebner@proxmox.com>
---
 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'
-- 
2.39.2



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

Re: [pve-devel] [PATCH qemu-server 03/10] test: cfg2cmd: don't use QEMU binary version less than 4.0 for tests

[Daniel Kral]

Another small misspelling in the following tests:

s/wih/with

On Tue, 23 Jul 2024 17:25:40 +0200, Fiona Ebner wrote:
> 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

and

On Tue, 23 Jul 2024 17:25:40 +0200, Fiona Ebner wrote:
> 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

Otherwise:

Reviewed-by: Daniel Kral <d.kral@proxmox.com>


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

[pve-devel] [PATCH qemu-server 04/10] cfg2cmd: require at least QEMU binary version 4.0

[Fiona Ebner]

The minimum supported version for a Proxmox VE 8 node is QEMU 8.0.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 PVE/QemuServer.pm          | 4 ++--
 test/cfg2cmd/old-qemu.conf | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 65784187..75995366 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3554,9 +3554,9 @@ sub config_to_command {
     my $kvm_binary = get_command_for_arch($arch);
     my $kvmver = kvm_user_version($kvm_binary);
 
-    if (!$kvmver || $kvmver !~ m/^(\d+)\.(\d+)/ || $1 < 3) {
+    if (!$kvmver || $kvmver !~ m/^(\d+)\.(\d+)/ || $1 < 4) {
 	$kvmver //= "undefined";
-	die "Detected old QEMU binary ('$kvmver', at least 3.0 is required)\n";
+	die "Detected old QEMU binary ('$kvmver', at least 4.0 is required)\n";
     }
 
     my $add_pve_version = min_version($kvmver, 4, 1);
diff --git a/test/cfg2cmd/old-qemu.conf b/test/cfg2cmd/old-qemu.conf
index 08e852cd..14489a3b 100644
--- a/test/cfg2cmd/old-qemu.conf
+++ b/test/cfg2cmd/old-qemu.conf
@@ -1,4 +1,4 @@
 # TEST: Test QEMU version detection and expect fail on old version
-# QEMU_VERSION: 2.12.1
-# EXPECT_ERROR: Detected old QEMU binary ('2.12.1', at least 3.0 is required)
+# QEMU_VERSION: 3.0.1
+# EXPECT_ERROR: Detected old QEMU binary ('3.0.1', at least 4.0 is required)
 smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
-- 
2.39.2



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

[pve-devel] [PATCH qemu-server 05/10] test: cfg2cmd: don't use QEMU binary version less than 5.0 for tests

[Fiona Ebner]

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

[pve-devel] [PATCH qemu-server 06/10] cfg2cmd: require at least QEMU binary version 5.0

[Fiona Ebner]

The minimum supported version for a Proxmox VE 8 node is QEMU 8.0.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 PVE/QemuServer.pm          | 4 ++--
 test/cfg2cmd/old-qemu.conf | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 75995366..39b33438 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3554,9 +3554,9 @@ sub config_to_command {
     my $kvm_binary = get_command_for_arch($arch);
     my $kvmver = kvm_user_version($kvm_binary);
 
-    if (!$kvmver || $kvmver !~ m/^(\d+)\.(\d+)/ || $1 < 4) {
+    if (!$kvmver || $kvmver !~ m/^(\d+)\.(\d+)/ || $1 < 5) {
 	$kvmver //= "undefined";
-	die "Detected old QEMU binary ('$kvmver', at least 4.0 is required)\n";
+	die "Detected old QEMU binary ('$kvmver', at least 5.0 is required)\n";
     }
 
     my $add_pve_version = min_version($kvmver, 4, 1);
diff --git a/test/cfg2cmd/old-qemu.conf b/test/cfg2cmd/old-qemu.conf
index 14489a3b..e8129cf6 100644
--- a/test/cfg2cmd/old-qemu.conf
+++ b/test/cfg2cmd/old-qemu.conf
@@ -1,4 +1,4 @@
 # TEST: Test QEMU version detection and expect fail on old version
-# QEMU_VERSION: 3.0.1
-# EXPECT_ERROR: Detected old QEMU binary ('3.0.1', at least 4.0 is required)
+# QEMU_VERSION: 4.0.1
+# EXPECT_ERROR: Detected old QEMU binary ('4.0.1', at least 5.0 is required)
 smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
-- 
2.39.2



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

[pve-devel] [PATCH qemu-server 07/10] cfg2cmd: drop superfluous check for QEMU binary version 4.1

[Fiona Ebner]

The minimum supported version for Proxmox VE 8 nodes is QEMU 8.0 and
the beginning of the config_to_command() function already has a check
for at least version 5.0. No other caller of get_vm_machine() passes
in the parameter, so it can be removed from there as well.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 PVE/QemuServer.pm | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 39b33438..5331ec53 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3253,7 +3253,7 @@ sub windows_get_pinned_machine_version {
 }
 
 sub get_vm_machine {
-    my ($conf, $forcemachine, $arch, $add_pve_version) = @_;
+    my ($conf, $forcemachine, $arch) = @_;
 
     my $machine_conf = PVE::QemuServer::Machine::parse_machine($conf->{machine});
     my $machine = $forcemachine || $machine_conf->{type};
@@ -3268,13 +3268,11 @@ sub get_vm_machine {
 	}
 	$arch //= 'x86_64';
 	$machine ||= $default_machines->{$arch};
-	if ($add_pve_version) {
-	    my $pvever = PVE::QemuServer::Machine::get_pve_version($kvmversion);
-	    $machine .= "+pve$pvever";
-	}
+	my $pvever = PVE::QemuServer::Machine::get_pve_version($kvmversion);
+	$machine .= "+pve$pvever";
     }
 
-    if ($add_pve_version && $machine !~ m/\+pve\d+?(?:\.pxe)?$/) {
+    if ($machine !~ m/\+pve\d+?(?:\.pxe)?$/) {
 	my $is_pxe = $machine =~ m/^(.*?)\.pxe$/;
 	$machine = $1 if $is_pxe;
 
@@ -3559,9 +3557,7 @@ sub config_to_command {
 	die "Detected old QEMU binary ('$kvmver', at least 5.0 is required)\n";
     }
 
-    my $add_pve_version = min_version($kvmver, 4, 1);
-
-    my $machine_type = get_vm_machine($conf, $forcemachine, $arch, $add_pve_version);
+    my $machine_type = get_vm_machine($conf, $forcemachine, $arch);
     my $machine_version = extract_version($machine_type, $kvmver);
     $kvm //= 1 if is_native_arch($arch);
 
@@ -4108,10 +4104,8 @@ sub config_to_command {
     push @$machineFlags, 'smm=off' if should_disable_smm($conf, $vga, $machine_type);
 
     my $machine_type_min = $machine_type;
-    if ($add_pve_version) {
-	$machine_type_min =~ s/\+pve\d+$//;
-	$machine_type_min .= "+pve$required_pve_version";
-    }
+    $machine_type_min =~ s/\+pve\d+$//;
+    $machine_type_min .= "+pve$required_pve_version";
     push @$machineFlags, "type=${machine_type_min}";
 
     PVE::QemuServer::Machine::assert_valid_machine_property($conf, $machine_conf);
-- 
2.39.2



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

[pve-devel] [PATCH qemu-server 08/10] test: cfg2cmd: don't use QEMU binary version less than 6.0 for tests

[Fiona Ebner]

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 all but one of the affected tests, there's no real requirement to
test for a specific machine version either, so just use the latest.
The exception is the 'netdev' test, because it should stay distinct
from the 'netdev-7.1' test.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 test/cfg2cmd/bootorder-empty.conf       |  1 -
 test/cfg2cmd/bootorder-empty.conf.cmd   | 12 ++++++------
 test/cfg2cmd/bootorder-legacy.conf      |  1 -
 test/cfg2cmd/bootorder-legacy.conf.cmd  | 12 ++++++------
 test/cfg2cmd/bootorder.conf             |  1 -
 test/cfg2cmd/bootorder.conf.cmd         | 12 ++++++------
 test/cfg2cmd/netdev.conf                |  2 +-
 test/cfg2cmd/netdev.conf.cmd            |  2 +-
 test/cfg2cmd/simple-virtio-blk.conf     |  1 -
 test/cfg2cmd/simple-virtio-blk.conf.cmd |  8 ++++----
 10 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/test/cfg2cmd/bootorder-empty.conf b/test/cfg2cmd/bootorder-empty.conf
index 75c6f338..ccfadb9f 100644
--- a/test/cfg2cmd/bootorder-empty.conf
+++ b/test/cfg2cmd/bootorder-empty.conf
@@ -1,5 +1,4 @@
 # TEST: Test for an empty boot parameter producing no bootindices either
-# QEMU_VERSION: 5.1
 cores: 3
 boot: 
 ide2: none,media=cdrom
diff --git a/test/cfg2cmd/bootorder-empty.conf.cmd b/test/cfg2cmd/bootorder-empty.conf.cmd
index 855c6e2d..87fa6c28 100644
--- a/test/cfg2cmd/bootorder-empty.conf.cmd
+++ b/test/cfg2cmd/bootorder-empty.conf.cmd
@@ -23,17 +23,17 @@
   -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' \
   -device 'lsi,id=scsihw0,bus=pci.0,addr=0x5' \
-  -drive 'file=/var/lib/vz/images/8006/vm-8006-disk-0.qcow2,if=none,id=drive-scsi4,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-scsi4,discard=on,format=qcow2,cache=none,aio=io_uring,detect-zeroes=unmap' \
   -device 'scsi-hd,bus=scsihw0.0,scsi-id=4,drive=drive-scsi4,id=scsi4' \
-  -drive 'file=/var/lib/vz/images/8006/vm-8006-disk-0.qcow2,if=none,id=drive-virtio0,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-virtio0,discard=on,format=qcow2,cache=none,aio=io_uring,detect-zeroes=unmap' \
   -device 'virtio-blk-pci,drive=drive-virtio0,id=virtio0,bus=pci.0,addr=0xa,iothread=iothread-virtio0' \
-  -drive 'file=/var/lib/vz/images/8006/vm-8006-disk-0.qcow2,if=none,id=drive-virtio1,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-virtio1,discard=on,format=qcow2,cache=none,aio=io_uring,detect-zeroes=unmap' \
   -device 'virtio-blk-pci,drive=drive-virtio1,id=virtio1,bus=pci.0,addr=0xb,iothread=iothread-virtio1' \
   -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' \
+  -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' \
   -machine 'type=pc+pve0'
diff --git a/test/cfg2cmd/bootorder-legacy.conf b/test/cfg2cmd/bootorder-legacy.conf
index f49b0841..4e59268b 100644
--- a/test/cfg2cmd/bootorder-legacy.conf
+++ b/test/cfg2cmd/bootorder-legacy.conf
@@ -1,5 +1,4 @@
 # TEST: Test for a specific bootorder given by legacy 'boot' value
-# QEMU_VERSION: 5.1
 cores: 3
 boot: ndca
 bootdisk: virtio1
diff --git a/test/cfg2cmd/bootorder-legacy.conf.cmd b/test/cfg2cmd/bootorder-legacy.conf.cmd
index 2320abb6..a4c3f050 100644
--- a/test/cfg2cmd/bootorder-legacy.conf.cmd
+++ b/test/cfg2cmd/bootorder-legacy.conf.cmd
@@ -23,17 +23,17 @@
   -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 'lsi,id=scsihw0,bus=pci.0,addr=0x5' \
-  -drive 'file=/var/lib/vz/images/8006/vm-8006-disk-0.qcow2,if=none,id=drive-scsi4,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-scsi4,discard=on,format=qcow2,cache=none,aio=io_uring,detect-zeroes=unmap' \
   -device 'scsi-hd,bus=scsihw0.0,scsi-id=4,drive=drive-scsi4,id=scsi4' \
-  -drive 'file=/var/lib/vz/images/8006/vm-8006-disk-0.qcow2,if=none,id=drive-virtio0,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-virtio0,discard=on,format=qcow2,cache=none,aio=io_uring,detect-zeroes=unmap' \
   -device 'virtio-blk-pci,drive=drive-virtio0,id=virtio0,bus=pci.0,addr=0xa,iothread=iothread-virtio0' \
-  -drive 'file=/var/lib/vz/images/8006/vm-8006-disk-0.qcow2,if=none,id=drive-virtio1,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-virtio1,discard=on,format=qcow2,cache=none,aio=io_uring,detect-zeroes=unmap' \
   -device 'virtio-blk-pci,drive=drive-virtio1,id=virtio1,bus=pci.0,addr=0xb,iothread=iothread-virtio1,bootindex=302' \
   -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=100' \
+  -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=100' \
   -machine 'type=pc+pve0'
diff --git a/test/cfg2cmd/bootorder.conf b/test/cfg2cmd/bootorder.conf
index 8de64bfc..7991065d 100644
--- a/test/cfg2cmd/bootorder.conf
+++ b/test/cfg2cmd/bootorder.conf
@@ -1,5 +1,4 @@
 # TEST: Test for a specific bootorder given by 'boot: order=' property
-# QEMU_VERSION: 5.1
 cores: 3
 boot: order=virtio1;net0;scsi4;ide2
 ide2: none,media=cdrom
diff --git a/test/cfg2cmd/bootorder.conf.cmd b/test/cfg2cmd/bootorder.conf.cmd
index 8ba36dce..76bd55d7 100644
--- a/test/cfg2cmd/bootorder.conf.cmd
+++ b/test/cfg2cmd/bootorder.conf.cmd
@@ -23,17 +23,17 @@
   -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=103' \
   -device 'lsi,id=scsihw0,bus=pci.0,addr=0x5' \
-  -drive 'file=/var/lib/vz/images/8006/vm-8006-disk-0.qcow2,if=none,id=drive-scsi4,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-scsi4,discard=on,format=qcow2,cache=none,aio=io_uring,detect-zeroes=unmap' \
   -device 'scsi-hd,bus=scsihw0.0,scsi-id=4,drive=drive-scsi4,id=scsi4,bootindex=102' \
-  -drive 'file=/var/lib/vz/images/8006/vm-8006-disk-0.qcow2,if=none,id=drive-virtio0,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-virtio0,discard=on,format=qcow2,cache=none,aio=io_uring,detect-zeroes=unmap' \
   -device 'virtio-blk-pci,drive=drive-virtio0,id=virtio0,bus=pci.0,addr=0xa,iothread=iothread-virtio0' \
-  -drive 'file=/var/lib/vz/images/8006/vm-8006-disk-0.qcow2,if=none,id=drive-virtio1,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-virtio1,discard=on,format=qcow2,cache=none,aio=io_uring,detect-zeroes=unmap' \
   -device 'virtio-blk-pci,drive=drive-virtio1,id=virtio1,bus=pci.0,addr=0xb,iothread=iothread-virtio1,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=101' \
+  -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=101' \
   -machine 'type=pc+pve0'
diff --git a/test/cfg2cmd/netdev.conf b/test/cfg2cmd/netdev.conf
index 173949e7..dab152c0 100644
--- a/test/cfg2cmd/netdev.conf
+++ b/test/cfg2cmd/netdev.conf
@@ -1,7 +1,7 @@
 # TEST: Simple test for netdev related stuff
-# QEMU_VERSION: 5.0
 bootdisk: scsi0
 cores: 3
+machine: pc-i440fx-5.0
 memory: 768
 name: netdev
 net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0,mtu=900
diff --git a/test/cfg2cmd/netdev.conf.cmd b/test/cfg2cmd/netdev.conf.cmd
index 3ae60753..3c7c3248 100644
--- a/test/cfg2cmd/netdev.conf.cmd
+++ b/test/cfg2cmd/netdev.conf.cmd
@@ -23,4 +23,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:A0,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300,host_mtu=900' \
-  -machine 'type=pc+pve0'
+  -machine 'type=pc-i440fx-5.0+pve0'
diff --git a/test/cfg2cmd/simple-virtio-blk.conf b/test/cfg2cmd/simple-virtio-blk.conf
index eb97a48d..d9db7580 100644
--- a/test/cfg2cmd/simple-virtio-blk.conf
+++ b/test/cfg2cmd/simple-virtio-blk.conf
@@ -1,5 +1,4 @@
 # TEST: Test for a basic configuration with a VirtIO Block IOThread disk
-# QEMU_VERSION: 5.0
 bootdisk: virtio0
 cores: 3
 ide2: none,media=cdrom
diff --git a/test/cfg2cmd/simple-virtio-blk.conf.cmd b/test/cfg2cmd/simple-virtio-blk.conf.cmd
index 4e063f39..d19aca6b 100644
--- a/test/cfg2cmd/simple-virtio-blk.conf.cmd
+++ b/test/cfg2cmd/simple-virtio-blk.conf.cmd
@@ -22,12 +22,12 @@
   -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' \
-  -drive 'file=/var/lib/vz/images/8006/vm-8006-disk-0.qcow2,if=none,id=drive-virtio0,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-virtio0,discard=on,format=qcow2,cache=none,aio=io_uring,detect-zeroes=unmap' \
   -device 'virtio-blk-pci,drive=drive-virtio0,id=virtio0,bus=pci.0,addr=0xa,iothread=iothread-virtio0,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

[pve-devel] [PATCH qemu-server 09/10] test: cfg2cmd: don't use QEMU binary version less than 7.0 for tests

[Fiona Ebner]

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.ebner@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

[pve-devel] [PATCH qemu-server 10/10] test: cfg2cmd: don't use QEMU binary version less than 8.0 for tests

[Fiona Ebner]

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

Re: [pve-devel] [PATCH qemu-server 10/10] test: cfg2cmd: don't use QEMU binary version less than 8.0 for tests

[Daniel Kral]

Another small misspelling that could be corrected here:

s/depreacation/deprecation

On Tue, 23 Jul 2024 17:25:40 +0200, Fiona Ebner wrote:
> 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)

Otherwise, I haven't found anything to add to the changes and the test
cases are all passing on my machine as expected.

Therefore:

Reviewed-by: Daniel Kral <d.kral@proxmox.com>
Tested-by: Daniel Kral <d.kral@proxmox.com>


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

Re: [pve-devel] [PATCH qemu-server 10/10] test: cfg2cmd: don't use QEMU binary version less than 8.0 for tests

[Fiona Ebner]

Am 06.09.24 um 16:39 schrieb Daniel Kral:
> Another small misspelling that could be corrected here:
> 
> s/depreacation/deprecation
> 
> On Tue, 23 Jul 2024 17:25:40 +0200, Fiona Ebner wrote:
>> 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)
> 
> Otherwise, I haven't found anything to add to the changes and the test
> cases are all passing on my machine as expected.
> 
> Therefore:
> 
> Reviewed-by: Daniel Kral <d.kral@proxmox.com>
> Tested-by: Daniel Kral <d.kral@proxmox.com>
> 

Thank you for the review/testing!

Note (for the future): If the tags here are supposed to be for the whole
series, it would be customary to add them in a reply to the cover letter.

Feel free to send patches for the pre-existing typos you found. You
might want to wait until my series got applied to avoid merge-conflicts.
If there's going to be a v2 of my series for some reason, I can also add
them as follow-ups myself.


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