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 2010F1FF183 for ; Wed, 3 Dec 2025 14:31:22 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AA2D6A277; Wed, 3 Dec 2025 14:30:32 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Wed, 3 Dec 2025 14:26:35 +0100 Message-ID: <20251203132949.109685-10-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251203132949.109685-1-f.ebner@proxmox.com> References: <20251203132949.109685-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1764768548832 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.017 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 09/18] blockdev: switch blockdev_replace() to use QMP peer 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" Signed-off-by: Fiona Ebner --- src/PVE/QemuServer.pm | 2 +- src/PVE/QemuServer/Blockdev.pm | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index e3a8d116..638bc215 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -4453,7 +4453,7 @@ sub qemu_volume_snapshot_delete { PVE::QemuServer::Blockdev::blockdev_replace( $storecfg, - $vmid, + vm_qmp_peer($vmid), $machine_version, $attached_deviceid, $drive, diff --git a/src/PVE/QemuServer/Blockdev.pm b/src/PVE/QemuServer/Blockdev.pm index fa252ce0..614d71f4 100644 --- a/src/PVE/QemuServer/Blockdev.pm +++ b/src/PVE/QemuServer/Blockdev.pm @@ -868,7 +868,7 @@ sub blockdev_external_snapshot { #reopen current to snap blockdev_replace( $storecfg, - $vmid, + vm_qmp_peer($vmid), $machine_version, $deviceid, $drive, @@ -937,7 +937,7 @@ my sub blockdev_relative_backing_file { sub blockdev_replace { my ( $storecfg, - $vmid, + $qmp_peer, $machine_version, $deviceid, $drive, @@ -955,7 +955,7 @@ sub blockdev_replace { my $src_blockdev_name; if ($src_snap eq 'current') { # there might be other nodes on top like zeroinit, look up the current node below throttle - $src_blockdev_name = get_node_name_below_throttle(vm_qmp_peer($vmid), $deviceid, 1); + $src_blockdev_name = get_node_name_below_throttle($qmp_peer, $deviceid, 1); } else { $src_name_options = { 'snapshot-name' => $src_snap }; $src_blockdev_name = get_node_name('fmt', $drive_id, $volid, $src_name_options); @@ -983,15 +983,15 @@ sub blockdev_replace { get_node_name('fmt', $drive_id, $volid, { 'snapshot-name' => $parent_snap }); $target_fmt_blockdev->{backing} = $parent_fmt_nodename; } - mon_cmd($vmid, 'blockdev-add', %$target_fmt_blockdev); + qmp_cmd($qmp_peer, 'blockdev-add', %$target_fmt_blockdev); #reopen the current throttlefilter nodename with the target fmt nodename my $throttle_blockdev = generate_throttle_blockdev($drive, $target_fmt_blockdev->{'node-name'}, {}); - mon_cmd($vmid, 'blockdev-reopen', options => [$throttle_blockdev]); + qmp_cmd($qmp_peer, 'blockdev-reopen', options => [$throttle_blockdev]); } else { #intermediate snapshot - mon_cmd($vmid, 'blockdev-add', %$target_fmt_blockdev); + qmp_cmd($qmp_peer, 'blockdev-add', %$target_fmt_blockdev); #reopen the parent node with the new target fmt backing node my $parent_file_blockdev = generate_file_blockdev( @@ -1007,14 +1007,14 @@ sub blockdev_replace { { 'snapshot-name' => $parent_snap }, ); $parent_fmt_blockdev->{backing} = $target_fmt_blockdev->{'node-name'}; - mon_cmd($vmid, 'blockdev-reopen', options => [$parent_fmt_blockdev]); + qmp_cmd($qmp_peer, 'blockdev-reopen', options => [$parent_fmt_blockdev]); my $backing_file = blockdev_relative_backing_file($target_file_blockdev, $parent_file_blockdev); #change backing-file in qcow2 metadatas - mon_cmd( - $vmid, 'change-backing-file', + qmp_cmd( + $qmp_peer, 'change-backing-file', device => $deviceid, 'image-node-name' => $parent_fmt_blockdev->{'node-name'}, 'backing-file' => $backing_file, @@ -1022,7 +1022,7 @@ sub blockdev_replace { } # delete old file|fmt nodes - eval { detach(vm_qmp_peer($vmid), $src_blockdev_name); }; + eval { detach($qmp_peer, $src_blockdev_name); }; warn "detaching block node for $src_snap failed - $@" if $@; } -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel