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 197C91FF189 for ; Mon, 09 Mar 2026 18:00:17 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AD64757EC; Mon, 9 Mar 2026 17:59:36 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v2 16/18] blockdev: switch blockdev_commit() to use QMP peer Date: Mon, 9 Mar 2026 17:58:42 +0100 Message-ID: <20260309165913.219308-17-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: 1773075525444 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: 6IJ2CPTXHAOWPSM4U4OTHWS7XJ3QJUUP X-Message-ID-Hash: 6IJ2CPTXHAOWPSM4U4OTHWS7XJ3QJUUP 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 | 19 ++++++------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index bb3f7529..04fde77b 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -4421,7 +4421,7 @@ sub qemu_volume_snapshot_delete { print "delete first snapshot $snap\n"; PVE::QemuServer::VolumeChain::blockdev_commit( $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 dad39479..91e78495 100644 --- a/src/PVE/QemuServer/VolumeChain.pm +++ b/src/PVE/QemuServer/VolumeChain.pm @@ -192,7 +192,7 @@ sub blockdev_replace { } sub blockdev_commit { - my ($storecfg, $vmid, $machine_version, $deviceid, $drive, $src_snap, $target_snap) = @_; + my ($storecfg, $qmp_peer, $machine_version, $deviceid, $drive, $src_snap, $target_snap) = @_; my $volid = $drive->{file}; my $target_was_read_only; @@ -229,7 +229,7 @@ sub blockdev_commit { print "reopening internal read-only block node for '$target_snap' as writable\n"; $target_fmt_blockdev->{'read-only'} = JSON::false; $target_file_blockdev->{'read-only'} = JSON::false; - mon_cmd($vmid, 'blockdev-reopen', options => [$target_fmt_blockdev]); + qmp_cmd($qmp_peer, 'blockdev-reopen', options => [$target_fmt_blockdev]); # For the guest, the drive is still read-only, because the top throttle node is. } @@ -241,7 +241,7 @@ sub blockdev_commit { $opts->{'base-node'} = $target_fmt_blockdev->{'node-name'}; $opts->{'top-node'} = $src_fmt_blockdev->{'node-name'}; - mon_cmd($vmid, "block-commit", %$opts); + qmp_cmd($qmp_peer, "block-commit", %$opts); $jobs->{$job_id} = {}; # If the 'current' state is committed to its backing snapshot, the job will not complete @@ -255,17 +255,10 @@ sub blockdev_commit { # 'block-commit' will complete automatically. my $complete = $src_snap && $src_snap ne 'current' ? 'auto' : 'complete'; - PVE::QemuServer::BlockJob::monitor( - vm_qmp_peer($vmid), undef, $jobs, $complete, 0, 'commit', - ); + PVE::QemuServer::BlockJob::monitor($qmp_peer, undef, $jobs, $complete, 0, 'commit'); blockdev_delete( - $storecfg, - vm_qmp_peer($vmid), - $drive, - $src_file_blockdev, - $src_fmt_blockdev, - $src_snap, + $storecfg, $qmp_peer, $drive, $src_file_blockdev, $src_fmt_blockdev, $src_snap, ); }; my $err = $@; @@ -276,7 +269,7 @@ sub blockdev_commit { print "re-applying read-only flag for internal block node for '$target_snap'\n"; $target_fmt_blockdev->{'read-only'} = JSON::true; $target_file_blockdev->{'read-only'} = JSON::true; - eval { mon_cmd($vmid, 'blockdev-reopen', options => [$target_fmt_blockdev]); }; + eval { qmp_cmd($qmp_peer, 'blockdev-reopen', options => [$target_fmt_blockdev]); }; print "failed to re-apply read-only flag - $@\n" if $@; } -- 2.47.3