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 167FF1FF140 for ; Fri, 24 Apr 2026 13:36:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F310215385; Fri, 24 Apr 2026 13:36:35 +0200 (CEST) Message-ID: Date: Fri, 24 Apr 2026 13:36:32 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH qemu-server v3 11/18] block job: switch qemu_handle_concluded_blockjob() to use QMP peer To: Lukas Sichert , pve-devel@lists.proxmox.com References: <20260423093753.43199-1-f.ebner@proxmox.com> <20260423093753.43199-12-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: 1777030502322 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.008 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: QNYCZUPXUJAC36H2OCKIQKQVGDYNNJLK X-Message-ID-Hash: QNYCZUPXUJAC36H2OCKIQKQVGDYNNJLK 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 11:50 AM schrieb Lukas Sichert: >> diff --git a/src/PVE/QemuServer/BlockJob.pm b/src/PVE/QemuServer/BlockJob.pm >> index f76b1bde..9e8fbdd7 100644 >> --- a/src/PVE/QemuServer/BlockJob.pm >> +++ b/src/PVE/QemuServer/BlockJob.pm >> @@ -13,7 +13,7 @@ use PVE::Storage; >> use PVE::QemuServer::Agent qw(qga_check_running); >> use PVE::QemuServer::Blockdev; >> use PVE::QemuServer::Drive qw(checked_volume_format); >> -use PVE::QemuServer::Monitor qw(mon_cmd); >> +use PVE::QemuServer::Monitor qw(mon_cmd qmp_cmd vm_qmp_peer); >> use PVE::QemuServer::RunState; >> >> # If the job was started with auto-dismiss=false, it's necessary to dismiss it manually. Using this >> @@ -23,9 +23,9 @@ use PVE::QemuServer::RunState; >> # $job is the information about the job recorded on the PVE-side. >> # A block node $job->{'detach-node-name'} will be detached if present. >> sub qemu_handle_concluded_blockjob { >> - my ($vmid, $job_id, $qmp_info, $job) = @_; >> + my ($qmp_peer, $job_id, $qmp_info, $job) = @_; >> >> - eval { mon_cmd($vmid, 'job-dismiss', id => $job_id); }; >> + eval { qmp_cmd($qmp_peer, 'job-dismiss', id => $job_id); }; >> log_warn("$job_id: failed to dismiss job - $@") if $@; >> >> # If there was an error or if the job was cancelled, always detach the target. This is correct >> @@ -34,7 +34,7 @@ sub qemu_handle_concluded_blockjob { >> $job->{'detach-node-name'} = $job->{'target-node-name'} if $qmp_info->{error} || $job->{cancel}; >> >> if (my $node_name = $job->{'detach-node-name'}) { >> - eval { PVE::QemuServer::Blockdev::detach(vm_qmp_peer($vmid), $node_name); }; >> > The 'vm_qmp_peer' command has just been introduced to this file in this > commit. I'm a bit confused how it is already being removed. Am I missing > something or is this a error, that happened during rebasing? Good catch, adding the import for vm_qmp_peer already needs to happen in patch 07/18 "blockdev: switch get_node_name_below_throttle() to use QMP peer".