update to qemu 2.2.0-rc2

[pve-qemu-kvm.git] / debian / patches / backup-vma-correctly-propagate-error.patch

diff --git a/debian/patches/backup-vma-correctly-propagate-error.patch b/debian/patches/backup-vma-correctly-propagate-error.patch
index 076e86f9e7f2c4ccbae620b817f790193ae0d66a..b351947df16fd6d7d61b5e84661c9d3615fb0988 100644 (file)
--- a/debian/patches/backup-vma-correctly-propagate-error.patch
+++ b/debian/patches/backup-vma-correctly-propagate-error.patch
@@ -1,7 +1,7 @@
 Index: new/vma-writer.c
 ===================================================================
---- new.orig/vma-writer.c      2014-07-16 12:01:32.000000000 +0200
-+++ new/vma-writer.c   2014-07-16 12:01:35.000000000 +0200
+--- new.orig/vma-writer.c      2014-11-20 07:34:19.000000000 +0100
++++ new/vma-writer.c   2014-11-20 07:49:17.000000000 +0100
 @@ -798,6 +798,13 @@
      return transferred;
  }
@@ -18,8 +18,8 @@ Index: new/vma-writer.c
      g_assert(vmaw != NULL);
 Index: new/vma.h
 ===================================================================
---- new.orig/vma.h     2014-07-16 12:01:32.000000000 +0200
-+++ new/vma.h  2014-07-16 12:01:35.000000000 +0200
+--- new.orig/vma.h     2014-11-20 07:34:27.000000000 +0100
++++ new/vma.h  2014-11-20 07:49:17.000000000 +0100
 @@ -116,6 +116,7 @@
  
  VmaWriter *vma_writer_create(const char *filename, uuid_t uuid, Error **errp);
@@ -30,9 +30,9 @@ Index: new/vma.h
                            size_t len);
 Index: new/blockdev.c
 ===================================================================
---- new.orig/blockdev.c        2014-07-16 12:01:35.000000000 +0200
-+++ new/blockdev.c     2014-07-16 12:01:35.000000000 +0200
-@@ -1931,7 +1931,7 @@
+--- new.orig/blockdev.c        2014-11-20 07:49:14.000000000 +0100
++++ new/blockdev.c     2014-11-20 07:49:17.000000000 +0100
+@@ -2015,7 +2015,7 @@
                                 buf, &zero_bytes);
          if (ret < 0) {
              if (!backup_state.error) {