X-Git-Url: https://git.proxmox.com/?p=pve-qemu-kvm.git;a=blobdiff_plain;f=debian%2Fpatches%2Fold%2Fbackup-do-not-use-bdrv-drain-all.patch;fp=debian%2Fpatches%2Fold%2Fbackup-do-not-use-bdrv-drain-all.patch;h=0000000000000000000000000000000000000000;hp=c0c8e6db151abc97d0a30cf62c9475f8b3dfc061;hb=e8d0924679a5d7a3acfc128a1140ffdef0269338;hpb=dcfd9c72bc5bb92f7715f7eb52e6610bc629a1c8

diff --git a/debian/patches/old/backup-do-not-use-bdrv-drain-all.patch b/debian/patches/old/backup-do-not-use-bdrv-drain-all.patch
deleted file mode 100644
index c0c8e6d..0000000
--- a/debian/patches/old/backup-do-not-use-bdrv-drain-all.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-do not use  bdrv_drain_all()
-
-This seems to hang now (qemu 2.2), causing timeouts.
-
-Index: new/blockdev.c
-===================================================================
---- new.orig/blockdev.c	2014-12-29 06:27:15.000000000 +0100
-+++ new/blockdev.c	2014-12-29 07:11:53.000000000 +0100
-@@ -2107,9 +2107,6 @@
-         vma_writer_set_error(backup_state.vmaw, "backup cancelled");
-     }
- 
--    /* drain all i/o (awake jobs waiting for aio) */
--    bdrv_drain_all();
--
-     GList *l = backup_state.di_list;
-     while (l) {
-         PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
-@@ -2118,8 +2115,7 @@
-             BlockJob *job = di->bs->job;
-             if (job) {
-                 if (!di->completed) {
--                     block_job_cancel_sync(job);
--                     bdrv_drain_all(); /* drain all i/o (awake jobs waiting for aio) */
-+                    block_job_cancel_sync(job);
-                 }
-             }
-         }