From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id D875F1FF0AA for ; Tue, 03 Nov 2026 10:51:10 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 580FC21803; Tue, 03 Nov 2026 10:51:08 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server] tree-wide: properly adapt all version_cmp() calls to moved helper Date: Tue, 3 Nov 2026 10:48:41 +0100 Message-ID: <20261103095100.41582-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1793699463491 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.321 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: DRJP5C6OBWYOW2U7MCXEPY65KGLCNP4A X-Message-ID-Hash: DRJP5C6OBWYOW2U7MCXEPY65KGLCNP4A X-MailFrom: f.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: While commit 47c17885 ("helpers: drop local version helpers in favor of pve-common") works, because it explicitly imports version_cmp into the QemuServer::Helpers module, its intention is to switch over the helpers. Avoid the indirection as well as the duplicate PVE::Tools include in the QemuServer::Helpers module. Signed-off-by: Fiona Ebner --- src/PVE/QemuServer/Drive.pm | 3 +-- src/PVE/QemuServer/Helpers.pm | 1 - src/PVE/QemuServer/Machine.pm | 13 +++++-------- src/PVE/QemuServer/QMPHelpers.pm | 4 +++- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/PVE/QemuServer/Drive.pm b/src/PVE/QemuServer/Drive.pm index 0ca3d636..8b980650 100644 --- a/src/PVE/QemuServer/Drive.pm +++ b/src/PVE/QemuServer/Drive.pm @@ -845,8 +845,7 @@ sub virtio_win_iso_issue { my $cmp_with = sub { my ($other) = @_; - return PVE::QemuServer::Helpers::version_cmp(map { ($version[$_], $other->[$_]) } - 0 .. 2); + return PVE::Tools::version_cmp(map { ($version[$_], $other->[$_]) } 0 .. 2); }; for my $issue ($virtio_win_issues->@*) { diff --git a/src/PVE/QemuServer/Helpers.pm b/src/PVE/QemuServer/Helpers.pm index cead2011..ecd1944f 100644 --- a/src/PVE/QemuServer/Helpers.pm +++ b/src/PVE/QemuServer/Helpers.pm @@ -11,7 +11,6 @@ use PVE::Cluster; use PVE::INotify; use PVE::ProcFSTools; use PVE::Tools; -use PVE::Tools qw(version_cmp); use base 'Exporter'; our @EXPORT_OK = qw( diff --git a/src/PVE/QemuServer/Machine.pm b/src/PVE/QemuServer/Machine.pm index 79ecbec3..fa47d668 100644 --- a/src/PVE/QemuServer/Machine.pm +++ b/src/PVE/QemuServer/Machine.pm @@ -3,6 +3,8 @@ package PVE::QemuServer::Machine; use strict; use warnings; +use PVE::Tools; + use PVE::QemuServer::Helpers; use PVE::QemuServer::MetaInfo; use PVE::QemuServer::Monitor; @@ -298,13 +300,8 @@ sub machine_version_cmp { my ($major_a, $minor_a, $pve_a) = extract_version_parts($machine_type_a); my ($major_b, $minor_b, $pve_b) = extract_version_parts($machine_type_b); - return PVE::QemuServer::Helpers::version_cmp( - $major_a, - $major_b, - $minor_a, - $minor_b, - $pve_a, - $pve_b, + return PVE::Tools::version_cmp( + $major_a, $major_b, $minor_a, $minor_b, $pve_a, $pve_b, ); } @@ -345,7 +342,7 @@ sub can_run_pve_machine_version { my $pvever = $3; $kvmversion =~ m/(\d+)\.(\d+)/; - return 0 if PVE::QemuServer::Helpers::version_cmp($1, $major, $2, $minor) < 0; + return 0 if PVE::Tools::version_cmp($1, $major, $2, $minor) < 0; # if $pvever is missing or 0, we definitely support it as long as we didn't # fail the QEMU version check above diff --git a/src/PVE/QemuServer/QMPHelpers.pm b/src/PVE/QemuServer/QMPHelpers.pm index f474c123..6d9b0063 100644 --- a/src/PVE/QemuServer/QMPHelpers.pm +++ b/src/PVE/QemuServer/QMPHelpers.pm @@ -2,6 +2,8 @@ package PVE::QemuServer::QMPHelpers; use v5.36; +use PVE::Tools; + use PVE::QemuServer::Helpers; use PVE::QemuServer::Monitor qw(mon_cmd); @@ -59,7 +61,7 @@ sub runs_at_least_qemu_version($vmid, $major, $minor, $extra = undef) { die "could not query currently running version for VM $vmid\n" if !defined($v); $v = $v->{qemu}; - return PVE::QemuServer::Helpers::version_cmp( + return PVE::Tools::version_cmp( $v->{major}, $major, $v->{minor}, $minor, $v->{micro}, $extra, ) >= 0; } -- 2.47.3