refresh and enable debian/patches/backup-vma-remove-async-queue.patch

diff --git a/debian/patches/backup-vma-remove-async-queue.patch b/debian/patches/backup-vma-remove-async-queue.patch
index 6f2dc0fd86f43f863eee11ce3cb2b379077ce968..52e82e2cf7af312bae98763bc49c5cab73eb6d57 100644 (file)
--- a/debian/patches/backup-vma-remove-async-queue.patch
+++ b/debian/patches/backup-vma-remove-async-queue.patch
@@ -5,8 +5,8 @@ Also, previous code produced segmentation faults in qemu_co_mutex_lock().
 
 Index: new/vma-writer.c
 ===================================================================
---- new.orig/vma-writer.c      2014-03-27 08:59:26.000000000 +0100
-+++ new/vma-writer.c   2014-03-27 12:09:24.000000000 +0100
+--- new.orig/vma-writer.c      2014-05-05 09:41:01.000000000 +0200
++++ new/vma-writer.c   2014-05-05 09:41:57.000000000 +0200
 @@ -33,14 +33,8 @@
      do { if (DEBUG_VMA) { printf("vma: " fmt, ## __VA_ARGS__); } } while (0)
  
@@ -285,9 +285,9 @@ Index: new/vma-writer.c
  }
 Index: new/blockdev.c
 ===================================================================
---- new.orig/blockdev.c        2014-03-27 12:10:25.000000000 +0100
-+++ new/blockdev.c     2014-03-27 12:10:47.000000000 +0100
-@@ -1875,6 +1875,11 @@
+--- new.orig/blockdev.c        2014-05-05 09:41:01.000000000 +0200
++++ new/blockdev.c     2014-05-05 09:41:57.000000000 +0200
+@@ -1965,6 +1965,11 @@
          error_setg(&backup_state.error, "backup cancelled");
      }
  
@@ -299,7 +299,7 @@ Index: new/blockdev.c
      /* drain all i/o (awake jobs waiting for aio) */
      bdrv_drain_all();
  
-@@ -1887,6 +1892,7 @@
+@@ -1977,6 +1982,7 @@
              if (job) {
                  if (!di->completed) {
                       block_job_cancel_sync(job);

diff --git a/debian/patches/series b/debian/patches/series
index 98aa6d7ae85780cb0e6f6dc98501caa8b19f33d5..33290092cce67849dd2759a5ea256d56472467ff 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,7 +22,7 @@ backup-add-pve-monitor-commands.patch
 backup-add-dir-format.patch
 backup-do-not-return-errors-in-dump-callback.patch
 backup-vma-correctly-propagate-error.patch
-#backup-vma-remove-async-queue.patch
+backup-vma-remove-async-queue.patch
 #internal-snapshot-async.patch
 #disable-efi-enable-pxe-roms.patch
 #backup-vma-allow-empty-backups.patch