From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 1796B1FF0E2 for ; Thu, 30 Jul 2026 15:18:35 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 161292159F; Thu, 30 Jul 2026 15:17:54 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server 5/8] block job: monitor: make operation argument non-optional Date: Thu, 30 Jul 2026 15:15:54 +0200 Message-ID: <20260730131613.157722-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260730131613.157722-1-f.ebner@proxmox.com> References: <20260730131613.157722-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: 1785417458324 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.156 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_LOW -0.7 Sender listed at https://www.dnswl.org/, low trust 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: OIQULRIMW2NJF445OBE6XCFD3Z4DKCHL X-Message-ID-Hash: OIQULRIMW2NJF445OBE6XCFD3Z4DKCHL 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: There is nothing special about mirror other than being the first block job handled by the monitor() function. Signed-off-by: Fiona Ebner --- src/PVE/QemuMigrate.pm | 7 ++++++- src/PVE/QemuServer.pm | 2 +- src/PVE/QemuServer/BlockJob.pm | 3 +-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/PVE/QemuMigrate.pm b/src/PVE/QemuMigrate.pm index 8da6f15d..604eae82 100644 --- a/src/PVE/QemuMigrate.pm +++ b/src/PVE/QemuMigrate.pm @@ -1581,7 +1581,12 @@ sub phase2 { # thus, this command changes to it to blockjob complete (see qapi docs) eval { PVE::QemuServer::BlockJob::monitor( - vm_qmp_peer($vmid), undef, $self->{storage_migration_jobs}, 'cancel', + vm_qmp_peer($vmid), + undef, + $self->{storage_migration_jobs}, + 'cancel', + undef, + 'mirror', ); }; if (my $err = $@) { diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index 9aec7f9c..1be89be9 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -8010,7 +8010,7 @@ sub clone_disk { # previous drive-mirrors if (($completion && $completion eq 'complete') && (scalar(keys %$jobs) > 0)) { PVE::QemuServer::BlockJob::monitor( - vm_qmp_peer($vmid), $newvmid, $jobs, $completion, $qga, + vm_qmp_peer($vmid), $newvmid, $jobs, $completion, $qga, 'mirror', ); } goto no_data_clone; diff --git a/src/PVE/QemuServer/BlockJob.pm b/src/PVE/QemuServer/BlockJob.pm index 14d814ee..3b105c37 100644 --- a/src/PVE/QemuServer/BlockJob.pm +++ b/src/PVE/QemuServer/BlockJob.pm @@ -120,7 +120,6 @@ sub monitor { if $vmiddst && $qmp_peer->{type} ne 'qmp'; $completion //= 'complete'; - $op //= "mirror"; eval { my $ready_message_printed; @@ -341,7 +340,7 @@ sub qemu_drive_mirror { die "mirroring error: $err\n"; } - monitor(vm_qmp_peer($vmid), $vmiddst, $jobs, $completion, $qga); + monitor(vm_qmp_peer($vmid), $vmiddst, $jobs, $completion, $qga, 'mirror'); } # Callers should version guard this (only available with a binary >= QEMU 8.2) -- 2.47.3