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 A12651FF136 for ; Mon, 09 Mar 2026 18:01:39 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0D6E16B23; Mon, 9 Mar 2026 18:00:00 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v2 15/18] blockdev: switch blockdev_stream() to use QMP peer Date: Mon, 9 Mar 2026 17:58:41 +0100 Message-ID: <20260309165913.219308-16-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260309165913.219308-1-f.ebner@proxmox.com> References: <20260309165913.219308-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: 1773075525343 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.004 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 Message-ID-Hash: PZTQRLXQB4SMZPMM55QZ2MPEVTDF6RQ4 X-Message-ID-Hash: PZTQRLXQB4SMZPMM55QZ2MPEVTDF6RQ4 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: Signed-off-by: Fiona Ebner --- src/PVE/QemuServer.pm | 2 +- src/PVE/QemuServer/VolumeChain.pm | 25 +++++++++++++------------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index bcc6f553..bb3f7529 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -4446,7 +4446,7 @@ sub qemu_volume_snapshot_delete { print "stream intermediate snapshot $snap to $childsnap\n"; PVE::QemuServer::VolumeChain::blockdev_stream( $storecfg, - $vmid, + vm_qmp_peer($vmid), $machine_version, $attached_deviceid, $drive, diff --git a/src/PVE/QemuServer/VolumeChain.pm b/src/PVE/QemuServer/VolumeChain.pm index d2042614..dad39479 100644 --- a/src/PVE/QemuServer/VolumeChain.pm +++ b/src/PVE/QemuServer/VolumeChain.pm @@ -284,8 +284,16 @@ sub blockdev_commit { } sub blockdev_stream { - my ($storecfg, $vmid, $machine_version, $deviceid, $drive, $snap, $parent_snap, $target_snap) = - @_; + my ( + $storecfg, + $qmp_peer, + $machine_version, + $deviceid, + $drive, + $snap, + $parent_snap, + $target_snap, + ) = @_; my $volid = $drive->{file}; $target_snap = undef if $target_snap eq 'current'; @@ -333,20 +341,13 @@ sub blockdev_stream { $options->{'base-node'} = $parent_fmt_blockdev->{'node-name'}; $options->{'backing-file'} = $backing_file; - mon_cmd($vmid, 'block-stream', %$options); + qmp_cmd($qmp_peer, 'block-stream', %$options); $jobs->{$job_id} = {}; - PVE::QemuServer::BlockJob::monitor( - vm_qmp_peer($vmid), undef, $jobs, 'auto', 0, 'stream', - ); + PVE::QemuServer::BlockJob::monitor($qmp_peer, undef, $jobs, 'auto', 0, 'stream'); blockdev_delete( - $storecfg, - vm_qmp_peer($vmid), - $drive, - $snap_file_blockdev, - $snap_fmt_blockdev, - $snap, + $storecfg, $qmp_peer, $drive, $snap_file_blockdev, $snap_fmt_blockdev, $snap, ); } -- 2.47.3