[pve-devel] [PATCH-SERIES qemu-server] adapt to QEMU 8.0 removed and deprecated features

[pve-devel] [PATCH-SERIES qemu-server] adapt to QEMU 8.0 removed and deprecated features

[Fiona Ebner]

Fiona Ebner (4):
  cfg2cmd: use actual backend names instead of removed tty and paraport
    aliases
  cfg2cmd: replace deprecated no-acpi option with acpi=off machine flag
  cfg2cmd: replace deprecated no-hpet option with hpet=off machine flag
  schema: avoid using deprecated -no-hpet in example for 'args' property

 PVE/QemuServer.pm                                      | 10 +++++-----
 test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd  |  3 +--
 test/cfg2cmd/custom-cpu-model.conf.cmd                 |  3 +--
 test/cfg2cmd/i440fx-win10-hostpci.conf.cmd             |  3 +--
 test/cfg2cmd/minimal-defaults-to-new-machine.conf.cmd  |  1 +
 .../minimal-defaults-unsupported-pve-version.conf.cmd  |  1 +
 test/cfg2cmd/old-qemu.conf.cmd                         |  1 +
 test/cfg2cmd/ostype-usb13-error.conf.cmd               |  1 +
 test/cfg2cmd/q35-usb13-error.conf.cmd                  |  1 +
 test/cfg2cmd/q35-win10-hostpci.conf.cmd                |  3 +--
 test/cfg2cmd/spice-win.conf.cmd                        |  3 +--
 test/cfg2cmd/usb13-error.conf.cmd                      |  1 +
 12 files changed, 16 insertions(+), 15 deletions(-)
 create mode 100644 test/cfg2cmd/minimal-defaults-to-new-machine.conf.cmd
 create mode 100644 test/cfg2cmd/minimal-defaults-unsupported-pve-version.conf.cmd
 create mode 100644 test/cfg2cmd/old-qemu.conf.cmd
 create mode 100644 test/cfg2cmd/ostype-usb13-error.conf.cmd
 create mode 100644 test/cfg2cmd/q35-usb13-error.conf.cmd
 create mode 100644 test/cfg2cmd/usb13-error.conf.cmd

-- 
2.30.2

[pve-devel] [PATCH qemu-server 1/4] cfg2cmd: use actual backend names instead of removed tty and paraport aliases

[Fiona Ebner]

As described in:
https://qemu-project.gitlab.io/qemu/about/removed-features.html#chardev-backend-aliases-tty-and-parport-removed-in-8-0

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 c1d0fd2d..c7caa163 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3794,7 +3794,7 @@ sub config_to_command {
 	    }
 	} else {
 	    die "no such serial device\n" if ! -c $path;
-	    push @$devices, '-chardev', "tty,id=serial$i,path=$path";
+	    push @$devices, '-chardev', "serial,id=serial$i,path=$path";
 	    push @$devices, '-device', "isa-serial,chardev=serial$i";
 	}
     }
@@ -3803,7 +3803,7 @@ sub config_to_command {
     for (my $i = 0; $i < $MAX_PARALLEL_PORTS; $i++)  {
 	if (my $path = $conf->{"parallel$i"}) {
 	    die "no such parallel device\n" if ! -c $path;
-	    my $devtype = $path =~ m!^/dev/usb/lp! ? 'tty' : 'parport';
+	    my $devtype = $path =~ m!^/dev/usb/lp! ? 'serial' : 'parallel';
 	    push @$devices, '-chardev', "$devtype,id=parallel$i,path=$path";
 	    push @$devices, '-device', "isa-parallel,chardev=parallel$i";
 	}
-- 
2.30.2

[pve-devel] [PATCH qemu-server 2/4] cfg2cmd: replace deprecated no-acpi option with acpi=off machine flag

[Fiona Ebner]

like the deprecation message printed by QEMU suggests.

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

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index c7caa163..ffef9321 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3846,7 +3846,7 @@ sub config_to_command {
 
     push @$cmd, '-boot', "menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg";
 
-    push @$cmd, '-no-acpi' if defined($conf->{acpi}) && $conf->{acpi} == 0;
+    push $machineFlags->@*, 'acpi=off' if defined($conf->{acpi}) && $conf->{acpi} == 0;
 
     push @$cmd, '-no-reboot' if  defined($conf->{reboot}) && $conf->{reboot} == 0;
 
-- 
2.30.2

[pve-devel] [PATCH qemu-server 3/4] cfg2cmd: replace deprecated no-hpet option with hpet=off machine flag

[Fiona Ebner]

like the deprecation message printed by QEMU suggests.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 PVE/QemuServer.pm                                              | 2 +-
 test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd          | 3 +--
 test/cfg2cmd/custom-cpu-model.conf.cmd                         | 3 +--
 test/cfg2cmd/i440fx-win10-hostpci.conf.cmd                     | 3 +--
 test/cfg2cmd/minimal-defaults-to-new-machine.conf.cmd          | 1 +
 test/cfg2cmd/minimal-defaults-unsupported-pve-version.conf.cmd | 1 +
 test/cfg2cmd/old-qemu.conf.cmd                                 | 1 +
 test/cfg2cmd/ostype-usb13-error.conf.cmd                       | 1 +
 test/cfg2cmd/q35-usb13-error.conf.cmd                          | 1 +
 test/cfg2cmd/q35-win10-hostpci.conf.cmd                        | 3 +--
 test/cfg2cmd/spice-win.conf.cmd                                | 3 +--
 test/cfg2cmd/usb13-error.conf.cmd                              | 1 +
 12 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 test/cfg2cmd/minimal-defaults-to-new-machine.conf.cmd
 create mode 100644 test/cfg2cmd/minimal-defaults-unsupported-pve-version.conf.cmd
 create mode 100644 test/cfg2cmd/old-qemu.conf.cmd
 create mode 100644 test/cfg2cmd/ostype-usb13-error.conf.cmd
 create mode 100644 test/cfg2cmd/q35-usb13-error.conf.cmd
 create mode 100644 test/cfg2cmd/usb13-error.conf.cmd

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index ffef9321..ed7e3f67 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3878,7 +3878,7 @@ sub config_to_command {
 
     if ($winversion >= 6) {
 	push @$globalFlags, 'kvm-pit.lost_tick_policy=discard';
-	push @$cmd, '-no-hpet';
+	push @$machineFlags, 'hpet=off';
     }
 
     push @$rtcFlags, 'driftfix=slew' if $tdf;
diff --git a/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd b/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd
index 98230248..077437d2 100644
--- a/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd
+++ b/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd
@@ -13,7 +13,6 @@
   -nodefaults \
   -boot 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' \
   -vnc 'unix:/var/run/qemu-server/8006.vnc,password=on' \
-  -no-hpet \
   -cpu 'athlon,+aes,+avx,enforce,hv_ipi,hv_relaxed,hv_reset,hv_runtime,hv_spinlocks=0x1fff,hv_stimer,hv_synic,hv_time,hv_vapic,hv_vendor_id=testvend,hv_vpindex,+kvm_pv_eoi,-kvm_pv_unhalt,vendor=AuthenticAMD,host-phys-bits=true' \
   -m 512 \
   -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \
@@ -24,5 +23,5 @@
   -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3' \
   -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
   -rtc 'driftfix=slew,base=localtime' \
-  -machine 'type=pc-i440fx-5.1+pve0' \
+  -machine 'hpet=off,type=pc-i440fx-5.1+pve0' \
   -global 'kvm-pit.lost_tick_policy=discard'
diff --git a/test/cfg2cmd/custom-cpu-model.conf.cmd b/test/cfg2cmd/custom-cpu-model.conf.cmd
index 2e66a6b5..5a9daed8 100644
--- a/test/cfg2cmd/custom-cpu-model.conf.cmd
+++ b/test/cfg2cmd/custom-cpu-model.conf.cmd
@@ -13,7 +13,6 @@
   -nodefaults \
   -boot 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' \
   -vnc 'unix:/var/run/qemu-server/8006.vnc,password=on' \
-  -no-hpet \
   -cpu 'athlon,+aes,+avx,enforce,hv_ipi,hv_relaxed,hv_reset,hv_runtime,hv_spinlocks=0x1fff,hv_stimer,hv_synic,hv_time,hv_vapic,hv_vendor_id=testvend,hv_vpindex,+kvm_pv_eoi,-kvm_pv_unhalt,vendor=AuthenticAMD,+virt-ssbd,phys-bits=40' \
   -m 512 \
   -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \
@@ -24,5 +23,5 @@
   -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3' \
   -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
   -rtc 'driftfix=slew,base=localtime' \
-  -machine 'type=pc-i440fx-5.1+pve0' \
+  -machine 'hpet=off,type=pc-i440fx-5.1+pve0' \
   -global 'kvm-pit.lost_tick_policy=discard'
diff --git a/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd b/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd
index 89834e34..455c898d 100644
--- a/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd
+++ b/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd
@@ -15,7 +15,6 @@
   -nodefaults \
   -boot 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' \
   -vnc 'unix:/var/run/qemu-server/8006.vnc,password=on' \
-  -no-hpet \
   -cpu 'kvm64,enforce,hv_ipi,hv_relaxed,hv_reset,hv_runtime,hv_spinlocks=0x1fff,hv_stimer,hv_synic,hv_time,hv_vapic,hv_vpindex,+kvm_pv_eoi,+kvm_pv_unhalt,+lahf_lm,+sep' \
   -m 512 \
   -object 'memory-backend-ram,id=ram-node0,size=256M' \
@@ -34,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=2E:01:68:F9:9C:87,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300' \
   -rtc 'driftfix=slew,base=localtime' \
-  -machine 'type=pc-i440fx-5.1+pve0' \
+  -machine 'hpet=off,type=pc-i440fx-5.1+pve0' \
   -global 'kvm-pit.lost_tick_policy=discard'
diff --git a/test/cfg2cmd/minimal-defaults-to-new-machine.conf.cmd b/test/cfg2cmd/minimal-defaults-to-new-machine.conf.cmd
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/test/cfg2cmd/minimal-defaults-to-new-machine.conf.cmd
@@ -0,0 +1 @@
+
diff --git a/test/cfg2cmd/minimal-defaults-unsupported-pve-version.conf.cmd b/test/cfg2cmd/minimal-defaults-unsupported-pve-version.conf.cmd
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/test/cfg2cmd/minimal-defaults-unsupported-pve-version.conf.cmd
@@ -0,0 +1 @@
+
diff --git a/test/cfg2cmd/old-qemu.conf.cmd b/test/cfg2cmd/old-qemu.conf.cmd
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/test/cfg2cmd/old-qemu.conf.cmd
@@ -0,0 +1 @@
+
diff --git a/test/cfg2cmd/ostype-usb13-error.conf.cmd b/test/cfg2cmd/ostype-usb13-error.conf.cmd
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/test/cfg2cmd/ostype-usb13-error.conf.cmd
@@ -0,0 +1 @@
+
diff --git a/test/cfg2cmd/q35-usb13-error.conf.cmd b/test/cfg2cmd/q35-usb13-error.conf.cmd
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/test/cfg2cmd/q35-usb13-error.conf.cmd
@@ -0,0 +1 @@
+
diff --git a/test/cfg2cmd/q35-win10-hostpci.conf.cmd b/test/cfg2cmd/q35-win10-hostpci.conf.cmd
index 430be7e5..cf03989b 100644
--- a/test/cfg2cmd/q35-win10-hostpci.conf.cmd
+++ b/test/cfg2cmd/q35-win10-hostpci.conf.cmd
@@ -15,7 +15,6 @@
   -nodefaults \
   -boot 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' \
   -vnc 'unix:/var/run/qemu-server/8006.vnc,password=on' \
-  -no-hpet \
   -cpu 'kvm64,enforce,hv_ipi,hv_relaxed,hv_reset,hv_runtime,hv_spinlocks=0x1fff,hv_stimer,hv_synic,hv_time,hv_vapic,hv_vpindex,+kvm_pv_eoi,+kvm_pv_unhalt,+lahf_lm,+sep' \
   -m 512 \
   -object 'memory-backend-ram,id=ram-node0,size=256M' \
@@ -35,5 +34,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=2E:01:68:F9:9C:87,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300' \
   -rtc 'driftfix=slew,base=localtime' \
-  -machine 'type=pc-q35-5.1+pve0' \
+  -machine 'hpet=off,type=pc-q35-5.1+pve0' \
   -global 'kvm-pit.lost_tick_policy=discard'
diff --git a/test/cfg2cmd/spice-win.conf.cmd b/test/cfg2cmd/spice-win.conf.cmd
index 544b30a7..f12c0357 100644
--- a/test/cfg2cmd/spice-win.conf.cmd
+++ b/test/cfg2cmd/spice-win.conf.cmd
@@ -13,7 +13,6 @@
   -nodefaults \
   -boot 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' \
   -vnc 'unix:/var/run/qemu-server/8006.vnc,password=on' \
-  -no-hpet \
   -cpu 'kvm64,enforce,hv_ipi,hv_relaxed,hv_reset,hv_runtime,hv_spinlocks=0x1fff,hv_stimer,hv_synic,hv_time,hv_vapic,hv_vpindex,+kvm_pv_eoi,+kvm_pv_unhalt,+lahf_lm,+sep' \
   -m 768 \
   -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \
@@ -34,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 'type=pc-i440fx-4.0' \
+  -machine 'hpet=off,type=pc-i440fx-4.0' \
   -global 'kvm-pit.lost_tick_policy=discard'
diff --git a/test/cfg2cmd/usb13-error.conf.cmd b/test/cfg2cmd/usb13-error.conf.cmd
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/test/cfg2cmd/usb13-error.conf.cmd
@@ -0,0 +1 @@
+
-- 
2.30.2

[pve-devel] [PATCH qemu-server 4/4] schema: avoid using deprecated -no-hpet in example for 'args' property

[Fiona Ebner]

instead use a recent example that served as a workaround in #4625.

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

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index ed7e3f67..9175e4cb 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -558,7 +558,7 @@ EODESC
 	verbose_description => <<EODESCR,
 Arbitrary arguments passed to kvm, for example:
 
-args: -no-reboot -no-hpet
+args: -no-reboot -smbios 'type=0,vendor=FOO'
 
 NOTE: this option is for experts only.
 EODESCR
-- 
2.30.2

Re: [pve-devel] [PATCH-SERIES qemu-server] adapt to QEMU 8.0 removed and deprecated features

[Fiona Ebner]

Am 03.04.23 um 14:09 schrieb Fiona Ebner:
> Fiona Ebner (4):
>   cfg2cmd: use actual backend names instead of removed tty and paraport
>     aliases
>   cfg2cmd: replace deprecated no-acpi option with acpi=off machine flag
>   cfg2cmd: replace deprecated no-hpet option with hpet=off machine flag
>   schema: avoid using deprecated -no-hpet in example for 'args' property

Ping, especially for the first, because that is a removed feature. But
the others lead to warnings which is also confusing to users.

[pve-devel] applied-series: [PATCH-SERIES qemu-server] adapt to QEMU 8.0 removed and deprecated features

[Thomas Lamprecht]

Am 03/04/2023 um 14:09 schrieb Fiona Ebner:
> Fiona Ebner (4):
>   cfg2cmd: use actual backend names instead of removed tty and paraport
>     aliases
>   cfg2cmd: replace deprecated no-acpi option with acpi=off machine flag
>   cfg2cmd: replace deprecated no-hpet option with hpet=off machine flag
>   schema: avoid using deprecated -no-hpet in example for 'args' property
> 
>  PVE/QemuServer.pm                                      | 10 +++++-----
>  test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd  |  3 +--
>  test/cfg2cmd/custom-cpu-model.conf.cmd                 |  3 +--
>  test/cfg2cmd/i440fx-win10-hostpci.conf.cmd             |  3 +--
>  test/cfg2cmd/minimal-defaults-to-new-machine.conf.cmd  |  1 +
>  .../minimal-defaults-unsupported-pve-version.conf.cmd  |  1 +
>  test/cfg2cmd/old-qemu.conf.cmd                         |  1 +
>  test/cfg2cmd/ostype-usb13-error.conf.cmd               |  1 +
>  test/cfg2cmd/q35-usb13-error.conf.cmd                  |  1 +
>  test/cfg2cmd/q35-win10-hostpci.conf.cmd                |  3 +--
>  test/cfg2cmd/spice-win.conf.cmd                        |  3 +--
>  test/cfg2cmd/usb13-error.conf.cmd                      |  1 +
>  12 files changed, 16 insertions(+), 15 deletions(-)
>  create mode 100644 test/cfg2cmd/minimal-defaults-to-new-machine.conf.cmd
>  create mode 100644 test/cfg2cmd/minimal-defaults-unsupported-pve-version.conf.cmd
>  create mode 100644 test/cfg2cmd/old-qemu.conf.cmd
>  create mode 100644 test/cfg2cmd/ostype-usb13-error.conf.cmd
>  create mode 100644 test/cfg2cmd/q35-usb13-error.conf.cmd
>  create mode 100644 test/cfg2cmd/usb13-error.conf.cmd
> 


applied series, thanks!

But I had to fix-up 3/4, as that created a few empty test files.

I just removed all expected .cmd files and regenerated them by running the tests,
then compared the diff and squashed that into that patch.