[pve-devel] [PATCH qemu 1/4] pvebackup_co_dump_cb: do not call job->cancel()

Dietmar Maurer dietmar at proxmox.com
Sun Oct 27 08:24:59 CET 2019


The backup loop will automatically abort if we return an error.
---
 blockdev.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/blockdev.c b/blockdev.c
index 07561b6f96..3343388978 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -3254,10 +3254,8 @@ static int coroutine_fn pvebackup_co_dump_cb(void *opaque, BlockBackend *target,
                 if (!backup_state.error) {
                     vma_writer_error_propagate(backup_state.vmaw, &backup_state.error);
                 }
-                if (di->bs && di->bs->job) {
-                    job_cancel(&di->bs->job->job, true);
-                }
-                break;
+                qemu_co_mutex_unlock(&backup_state.backup_mutex);
+                return ret;
             } else {
                 backup_state.zero_bytes += zero_bytes;
                 if (remaining >= VMA_CLUSTER_SIZE) {
-- 
2.20.1




More information about the pve-devel mailing list