[PATCH qemu-server 5/8] block job: monitor: make operation argument non-optional

[Fiona Ebner <f.ebner@proxmox.com>]

There is nothing special about mirror other than being the first block
job handled by the monitor() function.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 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