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 3CFE01FF0B2 for ; Thu, 20 Aug 2026 11:06:06 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id BCC34215D2; Thu, 20 Aug 2026 11:05:52 +0200 (CEST) From: Christian Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH v3 qemu-server 4/6] helpers: add helper for min kvm package version comparison Date: Thu, 20 Aug 2026 11:05:26 +0200 Message-ID: <20260820090528.117853-5-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260820090528.117853-1-c.ebner@proxmox.com> References: <20260820090528.117853-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1787216718695 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.771 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: QEGKFPKJF3VIDYXCICW24N3DPZLTOQNQ X-Message-ID-Hash: QEGKFPKJF3VIDYXCICW24N3DPZLTOQNQ X-MailFrom: c.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: To be used for checking the minimum version of qemu-kvm package version, where the binary version check is not enough to detect versions having the pbs-restore `no-cache` flag. Signed-off-by: Christian Ebner --- changes since version 2: - adapt helper function name to fit better to codebase and be more expressive - call kvm_user_version() from helper itself instead of fetching and passing the version string, reducing potential misuse. - drop useless $subver matching src/PVE/QemuServer/Helpers.pm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/PVE/QemuServer/Helpers.pm b/src/PVE/QemuServer/Helpers.pm index 8047d9e6..5065a457 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 + binary_package_version_at_least ); my $nodename = PVE::INotify::nodename(); @@ -91,6 +92,18 @@ sub kvm_user_version { return 'unknown'; } +sub binary_package_version_at_least { + my ($major, $minor, $micro, $rel, $binary) = @_; + + my $package_version_str = kvm_user_version($binary, 1); + if ($package_version_str =~ m/^(\d+)\.(\d+)(?:\.(\d+))?-(\d+)/) { + return 1 if version_cmp($1, $major, $2, $minor, $3 // 0, $micro, $4, $rel) >= 0; + return 0; + } + + die "internal error: cannot check version of invalid string '$package_version_str'"; +} + # Paths and directories # FIXME: MAJOR VERSION: use /run/qemu-server everywhere instead of mixing /run and /var/run and rely -- 2.47.3