In preparation to move block job related helpers to a dedicated module. Like this, moving the code will be clearly visible in the diff without any changed lines sticking out in between.
Signed-off-by: Fiona Ebner <f.eb...@proxmox.com> --- src/PVE/QemuServer.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index 942a1363..7e944743 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -7701,7 +7701,7 @@ sub qemu_drive_mirror { # if a job already runs for this device we get an error, catch it for cleanup eval { mon_cmd($vmid, "drive-mirror", %$opts); }; if (my $err = $@) { - eval { PVE::QemuServer::qemu_blockjobs_cancel($vmid, $jobs) }; + eval { qemu_blockjobs_cancel($vmid, $jobs) }; warn "$@\n" if $@; die "mirroring error: $err\n"; } @@ -7805,7 +7805,7 @@ sub qemu_drive_mirror_monitor { } # if we clone a disk for a new target vm, we don't switch the disk - PVE::QemuServer::qemu_blockjobs_cancel($vmid, $jobs); + qemu_blockjobs_cancel($vmid, $jobs); if ($agent_running) { print "unfreeze filesystem\n"; @@ -7852,7 +7852,7 @@ sub qemu_drive_mirror_monitor { my $err = $@; if ($err) { - eval { PVE::QemuServer::qemu_blockjobs_cancel($vmid, $jobs) }; + eval { qemu_blockjobs_cancel($vmid, $jobs) }; die "block job ($op) error: $err"; } } -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel