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 DC0281FF0B6 for ; Thu, 12 Nov 2026 12:51:42 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 9FC4A2184E; Thu, 12 Nov 2026 12:50:17 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v7 11/32] migration: add 'skip-config-check' property and adapt to guest-common Date: Thu, 12 Nov 2026 12:48:43 +0100 Message-ID: <20261112115001.107306-12-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261112115001.107306-1-f.ebner@proxmox.com> References: <20261112115001.107306-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: 1794484205495 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.269 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: IG42Y33AJTK3NTALVLL4GKT32YWXTA5Z X-Message-ID-Hash: IG42Y33AJTK3NTALVLL4GKT32YWXTA5Z 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: With pve-guest-common commit "abstract migrate: intra-cluster: check config can be parsed on target", there now is a check to see if the configuration file can be parsed on the target node, so there should be a way to opt-out as an escape hatch. The tests need to be adapted for compatibility. Signed-off-by: Fiona Ebner --- Changes in v7: * Use factored out helper from guest-common. src/PVE/API2/Qemu.pm | 10 ++++++++++ src/test/MigrationTest/QemuMigrateMock.pm | 11 ++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/PVE/API2/Qemu.pm b/src/PVE/API2/Qemu.pm index 98b250fa..6a6f15b2 100644 --- a/src/PVE/API2/Qemu.pm +++ b/src/PVE/API2/Qemu.pm @@ -143,6 +143,15 @@ my $migrate_json_properties = { default => 0, description => 'Whether to migrate conntrack entries for running VMs.', }, + 'skip-config-check' => { + type => 'boolean', + optional => 1, + default => 0, + description => + 'For intra-cluster migration. Skip checking if the configuration can be parsed' + . ' successfully by the target. Using this flag can lead to dropped' + . ' configuration options if the target is too old to parse them.', + }, }; # Properties that will be forwarded via the HA stack to the LRM, which will then use them for its @@ -150,6 +159,7 @@ my $migrate_json_properties = { # HA migrations with many being hard-coded for the LRM invocation. my $ha_migrate_props = { 'with-conntrack-state' => 1, + 'skip-config-check' => 1, }; sub ha_migrate_json_properties { diff --git a/src/test/MigrationTest/QemuMigrateMock.pm b/src/test/MigrationTest/QemuMigrateMock.pm index be1a7368..90d905f6 100644 --- a/src/test/MigrationTest/QemuMigrateMock.pm +++ b/src/test/MigrationTest/QemuMigrateMock.pm @@ -66,6 +66,10 @@ $tunnel_module->mock( my $vmid = $1; die "resuming wrong VM '$vmid'\n" if $vmid ne $test_vmid; return; + } elsif ($command =~ m/^config (\d+) (\S+)$/) { + my ($vmid, $node) = ($1, $2); + die "check config for wrong VM '$vmid'\n" if $vmid ne $test_vmid; + return; } die "write_tunnel (mocked) - implement me: $command\n"; }, @@ -74,7 +78,12 @@ $tunnel_module->mock( my $qemu_migrate_module = Test::MockModule->new("PVE::QemuMigrate"); $qemu_migrate_module->mock( fork_tunnel => sub { - die "fork_tunnel (mocked) - implement me\n"; # currently no call should lead here + return { + writer => "mocked", + reader => "mocked", + pid => 123456, + version => 1, + }; }, start_remote_tunnel => sub { my ($self, $raddr, $rport, $ruri, $unix_socket_info) = @_; -- 2.47.3