From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu-server 3/4] cfg2cmd: replace deprecated no-hpet option with hpet=off machine flag
Date: Mon, 3 Apr 2023 14:09:44 +0200 [thread overview]
Message-ID: <20230403120945.51924-4-f.ebner@proxmox.com> (raw)
In-Reply-To: <20230403120945.51924-1-f.ebner@proxmox.com>
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
next prev parent reply other threads:[~2023-04-03 12:10 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-03 12:09 [pve-devel] [PATCH-SERIES qemu-server] adapt to QEMU 8.0 removed and deprecated features Fiona Ebner
2023-04-03 12:09 ` [pve-devel] [PATCH qemu-server 1/4] cfg2cmd: use actual backend names instead of removed tty and paraport aliases Fiona Ebner
2023-04-03 12:09 ` [pve-devel] [PATCH qemu-server 2/4] cfg2cmd: replace deprecated no-acpi option with acpi=off machine flag Fiona Ebner
2023-04-03 12:09 ` Fiona Ebner [this message]
2023-04-03 12:09 ` [pve-devel] [PATCH qemu-server 4/4] schema: avoid using deprecated -no-hpet in example for 'args' property Fiona Ebner
2023-06-06 6:35 ` [pve-devel] [PATCH-SERIES qemu-server] adapt to QEMU 8.0 removed and deprecated features Fiona Ebner
2023-06-07 15:40 ` [pve-devel] applied-series: " Thomas Lamprecht
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=20230403120945.51924-4-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal