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 6B3AA1FF0AA for ; Tue, 03 Nov 2026 13:50:13 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 1F61721896; Tue, 03 Nov 2026 13:49:34 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v6 16/26] helpers: move get_node_pvecfg_version() version helper to pve-cluster Date: Tue, 3 Nov 2026 13:48:08 +0100 Message-ID: <20261103124831.139399-17-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261103124831.139399-1-f.ebner@proxmox.com> References: <20261103124831.139399-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1793710117031 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.311 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: NZOTYH2JZCRLFMVBRYBSI2P734NENMBR X-Message-ID-Hash: NZOTYH2JZCRLFMVBRYBSI2P734NENMBR 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: To prepare for pve-container to check node versions too. While at it, switch to node_pvecfg_version_at_least() to simplify the code. Signed-off-by: Fiona Ebner --- Build dependency and dependency bump for pve-cluster needed! Changes in v6: * Adapt to David's conflicting series already being applied earlier. src/PVE/QemuMigrate.pm | 7 +------ src/PVE/QemuServer/Helpers.pm | 10 ---------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/PVE/QemuMigrate.pm b/src/PVE/QemuMigrate.pm index d93878cd..4ee36443 100644 --- a/src/PVE/QemuMigrate.pm +++ b/src/PVE/QemuMigrate.pm @@ -1397,14 +1397,9 @@ sub phase2 { my $rpcenv = PVE::RPCEnvironment::get(); my $authuser = $rpcenv->get_user(); - my $target_version = PVE::QemuServer::Helpers::get_node_pvecfg_version($self->{node}); - my $ticket_port = undef; # Check if target is new enough for having the port encoded in the proxy ticket. - if ( - $target_version - && PVE::Tools::pvecfg_min_version($target_version, 9, 1, 9) - ) { + if (PVE::Cluster::node_pvecfg_version_at_least($self->{node}, 9, 1, 9)) { $ticket_port = $spice_port; } diff --git a/src/PVE/QemuServer/Helpers.pm b/src/PVE/QemuServer/Helpers.pm index cead2011..8d64e524 100644 --- a/src/PVE/QemuServer/Helpers.pm +++ b/src/PVE/QemuServer/Helpers.pm @@ -293,16 +293,6 @@ sub config_aware_timeout { return $timeout; } -sub get_node_pvecfg_version { - my ($node) = @_; - - my $nodes_version_info = PVE::Cluster::get_node_kv('version-info', $node); - return if !$nodes_version_info->{$node}; - - my $version_info = decode_json($nodes_version_info->{$node}); - return $version_info->{version}; -} - sub parse_number_sets { my ($set) = @_; my $res = []; -- 2.47.3