From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 473E51FF136 for ; Mon, 09 Mar 2026 18:01:11 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0B8A9647A; Mon, 9 Mar 2026 17:59:56 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v2 10/18] blockdev: switch blockdev_external_snapshot() to use QMP peer Date: Mon, 9 Mar 2026 17:58:36 +0100 Message-ID: <20260309165913.219308-11-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: 1773075525045 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: G7OIKGX73SC564FQQMWPZYQZI5JR6CYG X-Message-ID-Hash: G7OIKGX73SC564FQQMWPZYQZI5JR6CYG 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 | 8 +++++++- src/PVE/QemuServer/VolumeChain.pm | 10 +++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index ddeb394c..3c698c4c 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -4356,7 +4356,13 @@ sub qemu_volume_snapshot { my $snapshots = PVE::Storage::volume_snapshot_info($storecfg, $volid); my $parent_snap = $snapshots->{'current'}->{parent}; PVE::QemuServer::VolumeChain::blockdev_external_snapshot( - $storecfg, $vmid, $machine_version, $deviceid, $drive, $snap, $parent_snap, + $storecfg, + vm_qmp_peer($vmid), + $machine_version, + $deviceid, + $drive, + $snap, + $parent_snap, ); } elsif ($do_snapshots_type eq 'storage') { PVE::Storage::volume_snapshot($storecfg, $volid, $snap); diff --git a/src/PVE/QemuServer/VolumeChain.pm b/src/PVE/QemuServer/VolumeChain.pm index 01c5dd9b..8c0749de 100644 --- a/src/PVE/QemuServer/VolumeChain.pm +++ b/src/PVE/QemuServer/VolumeChain.pm @@ -14,7 +14,7 @@ use PVE::QemuServer::Drive; use PVE::QemuServer::Monitor qw(mon_cmd qmp_cmd vm_qmp_peer); sub blockdev_external_snapshot { - my ($storecfg, $vmid, $machine_version, $deviceid, $drive, $snap, $parent_snap) = @_; + my ($storecfg, $qmp_peer, $machine_version, $deviceid, $drive, $snap, $parent_snap) = @_; print "Creating a new current volume with $snap as backing snap\n"; @@ -26,7 +26,7 @@ sub blockdev_external_snapshot { #reopen current to snap blockdev_replace( $storecfg, - vm_qmp_peer($vmid), + $qmp_peer, $machine_version, $deviceid, $drive, @@ -53,11 +53,11 @@ sub blockdev_external_snapshot { #backing need to be forced to undef in blockdev, to avoid reopen of backing-file on blockdev-add $new_fmt_blockdev->{backing} = undef; - mon_cmd($vmid, 'blockdev-add', %$new_fmt_blockdev); + qmp_cmd($qmp_peer, 'blockdev-add', %$new_fmt_blockdev); print "blockdev-snapshot: reopen current with $snap backing image\n"; - mon_cmd( - $vmid, 'blockdev-snapshot', + qmp_cmd( + $qmp_peer, 'blockdev-snapshot', node => $snap_fmt_blockdev->{'node-name'}, overlay => $new_fmt_blockdev->{'node-name'}, ); -- 2.47.3