Files
pve-qemu-qoup/debian/patches/pve/0047-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch
T

34 lines
1.1 KiB
Diff
Raw Normal View History

2021-03-15 16:41:24 +01:00
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.
2022-01-13 10:34:33 +01:00
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2021-03-15 16:41:24 +01:00
---
2021-05-27 12:43:32 +02:00
block/io.c | 4 ++++
1 file changed, 4 insertions(+)
2021-03-15 16:41:24 +01:00
diff --git a/block/io.c b/block/io.c
2022-10-14 14:07:13 +02:00
index 0a8cbefe86..531b3b7a2d 100644
2021-03-15 16:41:24 +01:00
--- a/block/io.c
+++ b/block/io.c
2022-10-14 14:07:13 +02:00
@@ -1734,6 +1734,10 @@ static int bdrv_pad_request(BlockDriverState *bs,
2021-05-27 12:43:32 +02:00
{
int ret;
2021-03-15 16:41:24 +01:00
2021-05-27 12:43:32 +02:00
+ if (!qiov) {
+ return 0;
2021-03-15 16:41:24 +01:00
+ }
+
2021-05-27 12:43:32 +02:00
bdrv_check_qiov_request(*offset, *bytes, *qiov, *qiov_offset, &error_abort);
2021-03-15 16:41:24 +01:00
2021-05-27 12:43:32 +02:00
if (!bdrv_init_padding(bs, *offset, *bytes, pad)) {