From: Fiona Ebner <f.ebner@proxmox.com>
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 [thread overview]
Message-ID: <20261103124831.139399-17-f.ebner@proxmox.com> (raw)
In-Reply-To: <20261103124831.139399-1-f.ebner@proxmox.com>
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 <f.ebner@proxmox.com>
---
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
next prev parent reply other threads:[~2026-11-03 12:50 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-03 12:47 [PATCH-SERIES many v6 00/26] migration: strict config check for intra-cluster migration Fiona Ebner
2026-11-03 12:47 ` [PATCH common v6 01/26] rest handler: handle: respect schema's 'type-property' when resolving type Fiona Ebner
2026-11-03 12:47 ` [PATCH cluster v6 02/26] cluster: add more convenience helpers for checking node versions Fiona Ebner
2026-11-03 12:47 ` [PATCH ha-manager v6 03/26] manager: add missing PVE::HA::Resources import Fiona Ebner
2026-11-03 12:47 ` [PATCH ha-manager v6 04/26] update crm commands: align logging with next state started/stopped Fiona Ebner
2026-11-03 12:47 ` [PATCH ha-manager v6 05/26] manager: factor out helper to check if requested resource motion is valid Fiona Ebner
2026-11-03 12:47 ` [PATCH ha-manager v6 06/26] next state stopped: align logging for motion command with next_state_started() Fiona Ebner
2026-11-03 12:47 ` [PATCH ha-manager v6 07/26] next state {stopped,started}: factor out helper to handle motion command Fiona Ebner
2026-11-03 12:48 ` [PATCH ha-manager v6 08/26] lrm: resource migration: support extra migration options Fiona Ebner
2026-11-03 12:48 ` [PATCH ha-manager v6 09/26] change service state: support hash as a parameter value Fiona Ebner
2026-11-03 12:48 ` [PATCH ha-manager v6 10/26] next state: handle motion command: support migration options Fiona Ebner
2026-11-03 12:48 ` [PATCH ha-manager v6 11/26] resources: add migrate_json_properties() method Fiona Ebner
2026-11-03 12:48 ` [PATCH ha-manager v6 12/26] queue resource motion: support migration options Fiona Ebner
2026-11-03 12:48 ` [PATCH ha-manager v6 13/26] crm command: support JSON-style migrate command Fiona Ebner
2026-11-03 12:48 ` [PATCH ha-manager v6 14/26] api: resources: migration: support additional migration options Fiona Ebner
2026-11-03 12:48 ` [PATCH ha-manager v6 15/26] test: add test for " Fiona Ebner
2026-11-03 12:48 ` Fiona Ebner [this message]
2026-11-03 12:48 ` [PATCH qemu-server v6 17/26] api: migrate: allow forwarding certain migration properties to HA Fiona Ebner
2026-11-03 12:48 ` [PATCH qemu-server v6 18/26] fix #7053: api: migrate: pass 'with-conntrack-state' flag to HA migration Fiona Ebner
2026-11-03 12:48 ` [PATCH qemu-server v6 19/26] qm: mtunnel: reply when a command is unknown Fiona Ebner
2026-11-03 12:48 ` [PATCH qemu-server v6 20/26] qm: mtunnel: add 'conf' command to do strict configuration parsing Fiona Ebner
2026-11-03 12:48 ` [PATCH qemu-server v6 21/26] migration: intra-cluster: check config can be parsed on target node Fiona Ebner
2026-11-03 12:48 ` [PATCH container v6 22/26] api: migrate: allow forwarding certain migration properties to HA Fiona Ebner
2026-11-03 12:48 ` [PATCH container v6 23/26] pct: introduce mtunnel command Fiona Ebner
2026-11-03 12:48 ` [PATCH container v6 24/26] d/control: bump versioned build dependency for libpve-common-perl to 9.0.12 Fiona Ebner
2026-11-03 12:48 ` [PATCH container v6 25/26] migration: intra-cluster: check config can be parsed on target node Fiona Ebner
2026-11-03 12:48 ` [PATCH manager v6 26/26] ui: migrate: add checkbox to allow skipping newly enforced config check Fiona Ebner
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=20261103124831.139399-17-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox