From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 82C1F1FF16F for ; Tue, 14 Oct 2025 16:39:51 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AC7407676; Tue, 14 Oct 2025 16:39:56 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Tue, 14 Oct 2025 16:39:16 +0200 Message-ID: <20251014143946.160679-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251014143946.160679-1-f.ebner@proxmox.com> References: <20251014143946.160679-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1760452752878 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.021 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH qemu-server 05/16] migration: offline volumes: drop deprecated special casing for TPM state X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Since qemu-server >= 7.2-1 with commit 13d121d7 ("fix #3861: migrate: fix live migration when cloud-init changes storage"), migration targets can handle the 'offline_volume' log line for passing back the new volume ID for an offline migrated volume to the source side. Drop the special handling for TPM state now, so that the special handling for parsing can also be dropped in the future. Signed-off-by: Fiona Ebner --- src/PVE/API2/Qemu.pm | 1 + src/PVE/QemuMigrate.pm | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/PVE/API2/Qemu.pm b/src/PVE/API2/Qemu.pm index 71bedc1e..4243e4da 100644 --- a/src/PVE/API2/Qemu.pm +++ b/src/PVE/API2/Qemu.pm @@ -3491,6 +3491,7 @@ __PACKAGE__->register_method({ } elsif ($line =~ m/^replicated_volume: (.*)$/) { $replicated_volumes->{$1} = 1; } elsif ($line =~ m/^tpmstate0: (.*)$/) { # Deprecated, use offline_volume instead + # TODO PVE 10.x drop special handling here $offline_volumes->{tpmstate0} = $1; } elsif ($line =~ m/^offline_volume: ([^:]+): (.*)$/) { $offline_volumes->{$1} = $2; diff --git a/src/PVE/QemuMigrate.pm b/src/PVE/QemuMigrate.pm index 78954c20..b5023864 100644 --- a/src/PVE/QemuMigrate.pm +++ b/src/PVE/QemuMigrate.pm @@ -1020,12 +1020,7 @@ sub phase2_start_local_cluster { my $new_volid = $self->{volume_map}->{$volid}; next if !$new_volid || $volid eq $new_volid; - # FIXME PVE 8.x only use offline_volume variant once all targets can handle it - if ($drivename eq 'tpmstate0') { - $input .= "$drivename: $new_volid\n"; - } else { - $input .= "offline_volume: $drivename: $new_volid\n"; - } + $input .= "offline_volume: $drivename: $new_volid\n"; } $input .= "spice_ticket: $migrate->{spice_ticket}\n" if $migrate->{spice_ticket}; -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel