1e4b6553e3
This patch backports bugfix patch series from qemu upstream v4.1.1 Signed-off-by: Ying Fang <fangying1@huawei.com>
60 lines
1.9 KiB
Diff
60 lines
1.9 KiB
Diff
From d9b88f7e0d56feb4d7daa2506e2756fc48e975a1 Mon Sep 17 00:00:00 2001
|
|
From: Max Reitz <mreitz@redhat.com>
|
|
Date: Fri, 1 Nov 2019 16:25:09 +0100
|
|
Subject: [PATCH] block: Add bdrv_co_get_self_request()
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
Message-id: 20191101152510.11719-3-mreitz@redhat.com
|
|
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
(cherry picked from commit c28107e9e55b11cd35cf3dc2505e3e69d10dcf13)
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
---
|
|
block/io.c | 18 ++++++++++++++++++
|
|
include/block/block_int.h | 1 +
|
|
2 files changed, 19 insertions(+)
|
|
|
|
diff --git a/block/io.c b/block/io.c
|
|
index d4ceaaa2ce..65b5102714 100644
|
|
--- a/block/io.c
|
|
+++ b/block/io.c
|
|
@@ -721,6 +721,24 @@ static bool is_request_serialising_and_aligned(BdrvTrackedRequest *req)
|
|
(req->bytes == req->overlap_bytes);
|
|
}
|
|
|
|
+/**
|
|
+ * Return the tracked request on @bs for the current coroutine, or
|
|
+ * NULL if there is none.
|
|
+ */
|
|
+BdrvTrackedRequest *coroutine_fn bdrv_co_get_self_request(BlockDriverState *bs)
|
|
+{
|
|
+ BdrvTrackedRequest *req;
|
|
+ Coroutine *self = qemu_coroutine_self();
|
|
+
|
|
+ QLIST_FOREACH(req, &bs->tracked_requests, list) {
|
|
+ if (req->co == self) {
|
|
+ return req;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return NULL;
|
|
+}
|
|
+
|
|
/**
|
|
* Round a region to cluster boundaries
|
|
*/
|
|
diff --git a/include/block/block_int.h b/include/block/block_int.h
|
|
index 4465b02242..05ee6b4866 100644
|
|
--- a/include/block/block_int.h
|
|
+++ b/include/block/block_int.h
|
|
@@ -964,6 +964,7 @@ void bdrv_unapply_subtree_drain(BdrvChild *child, BlockDriverState *old_parent);
|
|
|
|
bool coroutine_fn bdrv_wait_serialising_requests(BdrvTrackedRequest *self);
|
|
void bdrv_mark_request_serialising(BdrvTrackedRequest *req, uint64_t align);
|
|
+BdrvTrackedRequest *coroutine_fn bdrv_co_get_self_request(BlockDriverState *bs);
|
|
|
|
int get_tmp_filename(char *filename, int size);
|
|
BlockDriver *bdrv_probe_all(const uint8_t *buf, int buf_size,
|
|
--
|
|
2.23.0
|