add vma backup fix

diff --git a/debian/patches/pve/0043-vma-sizes-passed-to-blk_co_preadv-should-be-bytes-no.patch b/debian/patches/pve/0043-vma-sizes-passed-to-blk_co_preadv-should-be-bytes-no.patch
new file mode 100644 (file)
index 0000000..a96ddd9
--- /dev/null
+++ b/debian/patches/pve/0043-vma-sizes-passed-to-blk_co_preadv-should-be-bytes-no.patch
@@ -0,0 +1,27 @@
+From 26d9c0e4b3bf5cbcaf75767463ecfc87976ba09f Mon Sep 17 00:00:00 2001
+From: Wolfgang Bumiller <w.bumiller@proxmox.com>
+Date: Fri, 21 Oct 2016 09:09:26 +0200
+Subject: [PATCH 43/43] vma: sizes passed to blk_co_preadv should be bytes now
+
+---
+ vma.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/vma.c b/vma.c
+index a8fa4ff..752a21b 100644
+--- a/vma.c
++++ b/vma.c
+@@ -465,8 +465,8 @@ static void coroutine_fn backup_run(void *opaque)
+         iov.iov_len = VMA_CLUSTER_SIZE;
+         qemu_iovec_init_external(&qiov, &iov, 1);
+ 
+-        ret = blk_co_preadv(job->target, start * BACKUP_SECTORS_PER_CLUSTER,
+-                            BACKUP_SECTORS_PER_CLUSTER, &qiov, 0);
++        ret = blk_co_preadv(job->target, start * VMA_CLUSTER_SIZE,
++                            VMA_CLUSTER_SIZE, &qiov, 0);
+         if (ret < 0) {
+             vma_writer_set_error(job->vmaw, "read error", -1);
+             goto out;
+-- 
+2.1.4
+

diff --git a/debian/patches/series b/debian/patches/series
index fb8592bc35d060599f1288dd4ef30e5837253eb6..b870b21e4de82c6d6c7725c6fd552a97cf340fe3 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -40,6 +40,7 @@ pve/0039-rbd-disable-rbd_cache_writethrough_until_flush-with-.patch
 pve/0040-enable-cache-unsafe-for-vma-extract_content-and-qmp_.patch
 pve/0041-savevm-async-updates.patch
 pve/0042-qmp_snapshot_drive-add-aiocontext.patch
+pve/0043-vma-sizes-passed-to-blk_co_preadv-should-be-bytes-no.patch
 #see https://bugs.launchpad.net/qemu/+bug/1488363?comments=all
 extra/x86-lapic-Load-LAPIC-state-at-post_load.patch
 extra/0001-Revert-target-i386-disable-LINT0-after-reset.patch