From ecb27dd3bf605306bfe744768c17a28986a9006e Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Fri, 21 Oct 2016 09:12:01 +0200 Subject: [PATCH] add vma backup fix --- ...-to-blk_co_preadv-should-be-bytes-no.patch | 27 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 28 insertions(+) create mode 100644 debian/patches/pve/0043-vma-sizes-passed-to-blk_co_preadv-should-be-bytes-no.patch 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 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 +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 fb8592b..b870b21 100644 --- 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 -- 2.39.2