10e1093325
Bigger notable changes:
* Commit 1a30b0f5d7 ("block: .bdrv_open is non-coroutine and
unlocked") broke the PVE backup patches, in particular setting up
the backup dump block driver, because bdrv_new_open_driver() cannot
be called from a coroutine. To fix it, bdrv_co_open() is used
instead, and while it's a much more involved function, the result
should be essentially the same. The only difference I noticed is
that the BDRV_O_ALLOW_RDWR flag is also set in the resulting bds
(block driver state), but that shouldn't hurt.
Smaller notable changes:
* aio_set_fd_handler() dropped its 'is_external' parameter stating
that all callers now pass false in 60f782b6b7 ("aio: remove
aio_disable_external() API"). The calls in the PVE patches also
passed false, so just drop the parameter too.
* global_state_store() does not have a return value anymore, so the
user in the PVE savevm-async patch was adapted. For context, see
c33f1829f8 ("migration: never fail in global_state_store()").
* Renames affecting the PVE savevm-async patch:
migrate_use_block() -> migrate_block() and ram_counters -> mig_stats
9d4b1e5f22 ("migration: Move migrate_use_block() to options.c")
aff3f6606d ("migration: Rename ram_counters to mig_stats")
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Reiter <s.reiter@proxmox.com>
|
|
Date: Tue, 2 Mar 2021 16:11:54 +0100
|
|
Subject: [PATCH] block/io: accept NULL qiov in bdrv_pad_request
|
|
|
|
Some operations, e.g. block-stream, perform reads while discarding the
|
|
results (only copy-on-read matters). In this case they will pass NULL as
|
|
the target QEMUIOVector, which will however trip bdrv_pad_request, since
|
|
it wants to extend its passed vector.
|
|
|
|
Simply check for NULL and do nothing, there's no reason to pad the
|
|
target if it will be discarded anyway.
|
|
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
block/io.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/block/io.c b/block/io.c
|
|
index 055fcf7438..63f7b3ad3e 100644
|
|
--- a/block/io.c
|
|
+++ b/block/io.c
|
|
@@ -1710,6 +1710,10 @@ static int bdrv_pad_request(BlockDriverState *bs,
|
|
int sliced_niov;
|
|
size_t sliced_head, sliced_tail;
|
|
|
|
+ if (!qiov) {
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
/* Should have been checked by the caller already */
|
|
ret = bdrv_check_request32(*offset, *bytes, *qiov, *qiov_offset);
|
|
if (ret < 0) {
|