From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 93ACD1FF0AA for ; Tue, 22 Sep 2026 12:56:14 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id B3E87215BB; Tue, 22 Sep 2026 12:55:56 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server 8/9] helpers: factor out the version parts parsing Date: Tue, 22 Sep 2026 12:55:39 +0200 Message-ID: <20260922105550.2084078-9-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260922105550.2084078-1-d.csapak@proxmox.com> References: <20260922105550.2084078-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.458 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: 2R3JPH2UHM2BF55C6GROMTKQK43QVVY6 X-Message-ID-Hash: 2R3JPH2UHM2BF55C6GROMTKQK43QVVY6 X-MailFrom: d.csapak@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: this can be useful on it's own when needing to pass the individual parts of the version to something else. Signed-off-by: Dominik Csapak --- src/PVE/QemuServer/Helpers.pm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/PVE/QemuServer/Helpers.pm b/src/PVE/QemuServer/Helpers.pm index dd17eef5..1e55ad6c 100644 --- a/src/PVE/QemuServer/Helpers.pm +++ b/src/PVE/QemuServer/Helpers.pm @@ -21,6 +21,7 @@ our @EXPORT_OK = qw( parse_number_sets windows_version get_host_arch + version_parts ); my $nodename = PVE::INotify::nodename(); @@ -224,11 +225,28 @@ sub vm_running_locally { return instance_running_locally($pidfile); } +# Parses a version string like X.Y.Z-pveW and returns (X, Y, Z, W) as numeric values. +sub version_parts { + my ($verstr) = @_; + + if ($verstr =~ m/^(\d+)\.(\d+)(?:\.(\d+))?(?:\+pve(\d+))?/) { + my $major = $1 + 0; + my $minor = $2 + 0; + my $patch = $3; + $patch += 0 if defined($patch); + my $pve = $4; + $pve += 0 if defined($pve); + return ($major, $minor, $patch, $pve); + } + + return; +} + sub min_version { my ($verstr, $major, $minor, $pve) = @_; - if ($verstr =~ m/^(\d+)\.(\d+)(?:\.(\d+))?(?:\+pve(\d+))?/) { - return 1 if version_cmp($1, $major, $2, $minor, $4, $pve) >= 0; + if (my ($got_major, $got_minor, $got_patch, $got_pve) = version_parts($verstr)) { + return 1 if version_cmp($got_major, $major, $got_minor, $minor, $got_pve, $pve) >= 0; return 0; } -- 2.47.3