update to qemu 2.2.0-rc2

[pve-qemu-kvm.git] / debian / patches / backup-do-not-return-errors-in-dump-callback.patch

diff --git a/debian/patches/backup-do-not-return-errors-in-dump-callback.patch b/debian/patches/backup-do-not-return-errors-in-dump-callback.patch
index 1d095431027f2582009759a75e94c67e0a92e36c..d217968027dfc70e460af570d180780196745b43 100644 (file)
--- a/debian/patches/backup-do-not-return-errors-in-dump-callback.patch
+++ b/debian/patches/backup-do-not-return-errors-in-dump-callback.patch
@@ -6,9 +6,9 @@ We simply report success and cancel the backup job instead.
 
 Index: new/blockdev.c
 ===================================================================
---- new.orig/blockdev.c        2014-06-17 06:15:08.000000000 +0200
-+++ new/blockdev.c     2014-06-17 06:15:09.000000000 +0200
-@@ -1914,6 +1914,11 @@
+--- new.orig/blockdev.c        2014-11-20 07:49:05.000000000 +0100
++++ new/blockdev.c     2014-11-20 07:49:14.000000000 +0100
+@@ -1991,6 +1991,11 @@
  {
      PVEBackupDevInfo *di = opaque;
  
@@ -20,7 +20,7 @@ Index: new/blockdev.c
      if (sector_num & 0x7f) {
          if (!backup_state.error) {
              error_setg(&backup_state.error,
-@@ -1924,7 +1929,6 @@
+@@ -2001,7 +2006,6 @@
      }
  
      int64_t cluster_num = sector_num >> 7;
@@ -28,7 +28,7 @@ Index: new/blockdev.c
  
      int ret = -1;
  
-@@ -1932,17 +1936,27 @@
+@@ -2009,17 +2013,27 @@
          size_t zero_bytes = 0;
          ret = vma_writer_write(backup_state.vmaw, di->dev_id, cluster_num,
                                 buf, &zero_bytes);
@@ -60,7 +60,7 @@ Index: new/blockdev.c
  }
  
  static void pvebackup_cleanup(void)
-@@ -2014,7 +2028,7 @@
+@@ -2091,7 +2105,7 @@
              BlockJob *job = di->bs->job;
              if (job) {
                  if (!di->completed) {