]> git.proxmox.com Git - qemu-server.git/commitdiff
cleanup: do not entry wait loop if block-job-cancel() fails.
authorDietmar Maurer <dietmar@proxmox.com>
Fri, 7 Nov 2014 14:31:56 +0000 (15:31 +0100)
committerDietmar Maurer <dietmar@proxmox.com>
Fri, 7 Nov 2014 14:31:56 +0000 (15:31 +0100)
PVE/QemuServer.pm

index 85ce28ad29e3c2d3746a80c50fd5b3ca0f92bbd2..778fb08594fbe1fae46a0fc03020b6deaf5684db 100644 (file)
@@ -5214,13 +5214,15 @@ sub qemu_drive_mirror {
            
        };
        if (my $err = $@) {
-           eval { vm_mon_cmd($vmid, "block-job-cancel", device => "drive-$drive"); };
-           while (1) {
-               my $stats = vm_mon_cmd($vmid, "query-block-jobs");
-               my $stat = @$stats[0];
-               last if !$stat;
-               sleep 1;
-           }
+           eval { 
+               vm_mon_cmd($vmid, "block-job-cancel", device => "drive-$drive"); 
+               while (1) {
+                   my $stats = vm_mon_cmd($vmid, "query-block-jobs");
+                   my $stat = @$stats[0];
+                   last if !$stat;
+                   sleep 1;
+               }
+           };
            die "mirroring error: $err";
        }