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 379E81FF140 for ; Fri, 24 Apr 2026 14:39:31 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 539F0174CB; Fri, 24 Apr 2026 13:50:37 +0200 (CEST) Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Fri, 24 Apr 2026 13:49:18 +0200 Message-Id: Subject: Re: [PATCH qemu-server v3 16/18] blockdev: switch blockdev_commit() to use QMP peer From: "Lukas Sichert" To: "Fiona Ebner" , References: <20260423093753.43199-1-f.ebner@proxmox.com> <20260423093753.43199-17-f.ebner@proxmox.com> In-Reply-To: <20260423093753.43199-17-f.ebner@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1777031268418 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.680 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: XCFCJLQHVCLGFXQYY4B3QQFWZIWCW4CW X-Message-ID-Hash: XCFCJLQHVCLGFXQYY4B3QQFWZIWCW4CW X-MailFrom: l.sichert@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: On 2026-04-23 11:36, Fiona Ebner wrote: > 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 9c6e2cdb..53c40eef 100644 > --- a/src/PVE/QemuServer.pm > +++ b/src/PVE/QemuServer.pm > @@ -4434,7 +4434,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/Volum= eChain.pm > index dad39479..91e78495 100644 > --- a/src/PVE/QemuServer/VolumeChain.pm > +++ b/src/PVE/QemuServer/VolumeChain.pm > @@ -192,7 +192,7 @@ sub blockdev_replace { > } > =20 > sub blockdev_commit { > - my ($storecfg, $vmid, $machine_version, $deviceid, $drive, $src_snap= , $target_snap) =3D @_; > + my ($storecfg, $qmp_peer, $machine_version, $deviceid, $drive, $src_= snap, $target_snap) =3D @_; > =20 > my $volid =3D $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'} =3D JSON::false; > $target_file_blockdev->{'read-only'} =3D JSON::false; > - mon_cmd($vmid, 'blockdev-reopen', options =3D> [$target_fmt_bloc= kdev]); > + qmp_cmd($qmp_peer, 'blockdev-reopen', options =3D> [$target_fmt_= blockdev]); > # For the guest, the drive is still read-only, because the top t= hrottle node is. > } > =20 > @@ -241,7 +241,7 @@ sub blockdev_commit { > $opts->{'base-node'} =3D $target_fmt_blockdev->{'node-name'}; > $opts->{'top-node'} =3D $src_fmt_blockdev->{'node-name'}; > =20 > - mon_cmd($vmid, "block-commit", %$opts); > + qmp_cmd($qmp_peer, "block-commit", %$opts); > $jobs->{$job_id} =3D {}; > =20 > # If the 'current' state is committed to its backing snapshot, t= he job will not complete > @@ -255,17 +255,10 @@ sub blockdev_commit { > # 'block-commit' will complete automatically. > my $complete =3D $src_snap && $src_snap ne 'current' ? 'auto' : = 'complete'; > =20 > - PVE::QemuServer::BlockJob::monitor( > - vm_qmp_peer($vmid), undef, $jobs, $complete, 0, 'commit', > - ); > + PVE::QemuServer::BlockJob::monitor($qmp_peer, undef, $jobs, $com= plete, 0, 'commit'); Similar to [1], but not as obvious. 'vm_qmp_peer' just got added in this series. > =20 > 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_b= lockdev, $src_snap, > ); > }; Same as above. > my $err =3D $@; > @@ -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'} =3D JSON::true; > $target_file_blockdev->{'read-only'} =3D JSON::true; > - eval { mon_cmd($vmid, 'blockdev-reopen', options =3D> [$target_f= mt_blockdev]); }; > + eval { qmp_cmd($qmp_peer, 'blockdev-reopen', options =3D> [$targ= et_fmt_blockdev]); }; > print "failed to re-apply read-only flag - $@\n" if $@; > } > =20 > --=20 > 2.47.3 [1] lore.proxmox.com/pve-devel/DI0L56K45KJK.1G3MBGPZI2KJV@proxmox.com/T/#m7= e7ffe8240f4092755e27c6072e0e27ffcdd96b5