[PATCH qemu-server 4/8] block job: monitor: factor out job status printing

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

The validity/presence of $job->{ready} does not depend on $job->{len}
in any way, so does not need to be part of the if block.

No functional change intended.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 src/PVE/QemuServer/BlockJob.pm | 57 +++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/src/PVE/QemuServer/BlockJob.pm b/src/PVE/QemuServer/BlockJob.pm
index 3c8de3e4..14d814ee 100644
--- a/src/PVE/QemuServer/BlockJob.pm
+++ b/src/PVE/QemuServer/BlockJob.pm
@@ -79,6 +79,35 @@ sub qemu_blockjobs_cancel {
     }
 }
 
+my sub print_job_status {
+    my ($job_id, $job, $duration) = @_;
+
+    if (my $total = $job->{len}) {
+        my $transferred = $job->{offset} || 0;
+        my $remaining = $total - $transferred;
+        my $percent = sprintf "%.2f", ($transferred * 100 / $total);
+
+        my $total_h = render_bytes($total, 1);
+        my $transferred_h = render_bytes($transferred, 1);
+
+        my $status = sprintf(
+            "transferred $transferred_h of $total_h ($percent%%) in %s",
+            render_duration($duration),
+        );
+
+        if ($job->{ready}) {
+            if ($job->{busy}) {
+                $status .= ", still busy"; # shouldn't even happen? but mirror is weird
+            } else {
+                $status .= ", ready";
+            }
+        }
+        print "$job_id: $status\n";
+    }
+
+    return;
+}
+
 # $completion can be either
 # 'complete': wait until all jobs are ready, job-complete them (default)
 # 'cancel': wait until all jobs are ready, block-job-cancel them
@@ -130,32 +159,10 @@ sub monitor {
                     qemu_handle_concluded_blockjob($qmp_peer, $job_id, $job, $jobs->{$job_id});
                 }
 
-                my $busy = $job->{busy};
-                my $ready = $job->{ready};
-                if (my $total = $job->{len}) {
-                    my $transferred = $job->{offset} || 0;
-                    my $remaining = $total - $transferred;
-                    my $percent = sprintf "%.2f", ($transferred * 100 / $total);
-
-                    my $duration = $ctime - $starttime;
-                    my $total_h = render_bytes($total, 1);
-                    my $transferred_h = render_bytes($transferred, 1);
-
-                    my $status = sprintf(
-                        "transferred $transferred_h of $total_h ($percent%%) in %s",
-                        render_duration($duration),
-                    );
-
-                    if ($ready) {
-                        if ($busy) {
-                            $status .= ", still busy"; # shouldn't even happen? but mirror is weird
-                        } else {
-                            $status .= ", ready";
-                        }
-                    }
-                    print "$job_id: $status\n" if !$jobs->{$job_id}->{ready};
-                    $jobs->{$job_id}->{ready} = $ready;
+                if (!$jobs->{$job_id}->{ready}) {
+                    print_job_status($job_id, $job, $ctime - $starttime);
                 }
+                $jobs->{$job_id}->{ready} = $job->{ready};
 
                 $readycounter++ if $job->{ready};
             }
-- 
2.47.3