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 2C0971FF140 for ; Fri, 24 Apr 2026 14:34:31 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 33B0F17C22; Fri, 24 Apr 2026 13:57:09 +0200 (CEST) Message-ID: Date: Fri, 24 Apr 2026 13:56:34 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH qemu-server v3 16/18] blockdev: switch blockdev_commit() to use QMP peer To: Lukas Sichert , pve-devel@lists.proxmox.com References: <20260423093753.43199-1-f.ebner@proxmox.com> <20260423093753.43199-17-f.ebner@proxmox.com> Content-Language: en-US From: Fiona Ebner In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1777031704399 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.009 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: 6WR426I2D7SLASYSDT6Z24JLVS5KKL7E X-Message-ID-Hash: 6WR426I2D7SLASYSDT6Z24JLVS5KKL7E 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: Am 24.04.26 um 1:47 PM schrieb Lukas Sichert: >> 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'); > Similar to [1], but not as obvious. 'vm_qmp_peer' just got added in this > series. >> >> 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, >> ); >> }; > Same as above. But patch 09/18 "blockdev: switch blockdev_replace() to use QMP peer" already adds an import for vm_qmp_peer and patches 13/18 "block job: switch qemu_drive_mirror_monitor() to use QMP peer" and 14/18 "blockdev: switch blockdev_delete() to use QMP peer" switched the functions to support having a QMP peer already, so what is the issue?