]> git.proxmox.com Git - pve-qemu.git/blob - debian/patches/pve/0038-pvebackup_co_dump_cb-do-not-call-job-cancel.patch
Update and rebase to QEMU 4.1
[pve-qemu.git] / debian / patches / pve / 0038-pvebackup_co_dump_cb-do-not-call-job-cancel.patch
1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: Dietmar Maurer <dietmar@proxmox.com>
3 Date: Wed, 30 Oct 2019 12:15:44 +0100
4 Subject: [PATCH] pvebackup_co_dump_cb: do not call job->cancel()
5
6 The backup loop will automatically abort if we return an error.
7 ---
8 blockdev.c | 6 ++----
9 1 file changed, 2 insertions(+), 4 deletions(-)
10
11 diff --git a/blockdev.c b/blockdev.c
12 index 530b76c82f..568f71fdb4 100644
13 --- a/blockdev.c
14 +++ b/blockdev.c
15 @@ -3274,10 +3274,8 @@ static int coroutine_fn pvebackup_co_dump_cb(void *opaque, BlockBackend *target,
16 if (!backup_state.error) {
17 vma_writer_error_propagate(backup_state.vmaw, &backup_state.error);
18 }
19 - if (di->bs && di->bs->job) {
20 - job_cancel(&di->bs->job->job, true);
21 - }
22 - break;
23 + qemu_co_mutex_unlock(&backup_state.backup_mutex);
24 + return ret;
25 } else {
26 backup_state.zero_bytes += zero_bytes;
27 if (remaining >= VMA_CLUSTER_SIZE) {