dc9827a6a4
Only very minor changes needed:
* Most patches in extra (or some version of them) are part of 7.0.0.
* aio_set_fd_handler got an extra parameter, but can just pass NULL
like we did for the related 'poll' parameter. See QEMU commit
826cc32423db2a99d184dbf4f507c737d7e7a4ae for more.
* Add include for qemu/memalign.h in vma.c and vma-writer.c.
* Add reverts for fixups of already reverted 0347a8fd4c ("block/rbd:
implement bdrv_co_block_status") that came in with 7.0.0. Those
fixups are not enough, see Proxmox bugzilla #4047.
* Two trivial context changes for bitmap-mirror patches.
* block_int.h got split up into multiple headers.
* Some context changes in configure and meson.build.
* Used the oppurtunity to squash fixup of bdrv_backuo_dump_create typo
in a later patch into the patch introducing the function (had to
move code to new header during rebase).
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
58 lines
2.0 KiB
Diff
58 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Fabian Ebner <f.ebner@proxmox.com>
|
|
Date: Wed, 22 Jun 2022 10:45:11 +0200
|
|
Subject: [PATCH] vma: create: support 64KiB-unaligned input images
|
|
|
|
which fixes backing up templates with such disks in PVE, for example
|
|
efitype=4m EFI disks on a file-based storage (size = 540672).
|
|
|
|
If there is not enough left to read, blk_co_preadv will return -EIO,
|
|
so limit the size in the last iteration.
|
|
|
|
For writing, an unaligned end is already handled correctly.
|
|
|
|
The call to memset is not strictly necessary, because writing also
|
|
checks that it doesn't write data beyond the end of the image. But
|
|
there are two reasons to do it:
|
|
1. It's cleaner that way.
|
|
2. It allows detecting when the final piece is all zeroes, which might
|
|
not happen if the buffer still contains data from the previous
|
|
iteration.
|
|
|
|
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
|
|
---
|
|
vma.c | 12 ++++++++++--
|
|
1 file changed, 10 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/vma.c b/vma.c
|
|
index e1a750ff50..b1137e27a7 100644
|
|
--- a/vma.c
|
|
+++ b/vma.c
|
|
@@ -549,7 +549,7 @@ static void coroutine_fn backup_run(void *opaque)
|
|
struct iovec iov;
|
|
QEMUIOVector qiov;
|
|
|
|
- int64_t start, end;
|
|
+ int64_t start, end, readlen;
|
|
int ret = 0;
|
|
|
|
unsigned char *buf = blk_blockalign(job->target, VMA_CLUSTER_SIZE);
|
|
@@ -563,8 +563,16 @@ static void coroutine_fn backup_run(void *opaque)
|
|
iov.iov_len = VMA_CLUSTER_SIZE;
|
|
qemu_iovec_init_external(&qiov, &iov, 1);
|
|
|
|
+ if (start + 1 == end) {
|
|
+ memset(buf, 0, VMA_CLUSTER_SIZE);
|
|
+ readlen = job->len - start * VMA_CLUSTER_SIZE;
|
|
+ assert(readlen > 0 && readlen <= VMA_CLUSTER_SIZE);
|
|
+ } else {
|
|
+ readlen = VMA_CLUSTER_SIZE;
|
|
+ }
|
|
+
|
|
ret = blk_co_preadv(job->target, start * VMA_CLUSTER_SIZE,
|
|
- VMA_CLUSTER_SIZE, &qiov, 0);
|
|
+ readlen, &qiov, 0);
|
|
if (ret < 0) {
|
|
vma_writer_set_error(job->vmaw, "read error", -1);
|
|
goto out;
|