[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v6 12/39] block: Fix BB AIOCB AioContext without BDS
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v6 12/39] block: Fix BB AIOCB AioContext without BDS |
Date: |
Mon, 12 Oct 2015 22:00:15 +0200 |
Fix the BlockBackend's AIOCB AioContext for aborting AIO in case there
is no BDS. If there is no implementation of AIOCBInfo::get_aio_context()
the AioContext is derived from the BDS the AIOCB belongs to. If that BDS
is NULL (because it has been removed from the BB) this will not work.
This patch makes blk_get_aio_context() fall back to the main loop
context if the BDS pointer is NULL and implements
AIOCBInfo::get_aio_context() (blk_aiocb_get_aio_context()) which invokes
blk_get_aio_context().
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
---
block/block-backend.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/block/block-backend.c b/block/block-backend.c
index 74642dc..c7e0f7b 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -18,6 +18,8 @@
/* Number of coroutines to reserve per attached device model */
#define COROUTINE_POOL_RESERVATION 64
+static AioContext *blk_aiocb_get_aio_context(BlockAIOCB *acb);
+
struct BlockBackend {
char *name;
int refcnt;
@@ -34,10 +36,12 @@ struct BlockBackend {
typedef struct BlockBackendAIOCB {
BlockAIOCB common;
QEMUBH *bh;
+ BlockBackend *blk;
int ret;
} BlockBackendAIOCB;
static const AIOCBInfo block_backend_aiocb_info = {
+ .get_aio_context = blk_aiocb_get_aio_context,
.aiocb_size = sizeof(BlockBackendAIOCB),
};
@@ -558,6 +562,7 @@ static BlockAIOCB *abort_aio_request(BlockBackend *blk,
BlockCompletionFunc *cb,
QEMUBH *bh;
acb = blk_aio_get(&block_backend_aiocb_info, blk, cb, opaque);
+ acb->blk = blk;
acb->ret = ret;
bh = aio_bh_new(blk_get_aio_context(blk), error_callback_bh, acb);
@@ -831,7 +836,17 @@ void blk_op_unblock_all(BlockBackend *blk, Error *reason)
AioContext *blk_get_aio_context(BlockBackend *blk)
{
- return bdrv_get_aio_context(blk->bs);
+ if (blk->bs) {
+ return bdrv_get_aio_context(blk->bs);
+ } else {
+ return qemu_get_aio_context();
+ }
+}
+
+static AioContext *blk_aiocb_get_aio_context(BlockAIOCB *acb)
+{
+ BlockBackendAIOCB *blk_acb = DO_UPCAST(BlockBackendAIOCB, common, acb);
+ return blk_get_aio_context(blk_acb->blk);
}
void blk_set_aio_context(BlockBackend *blk, AioContext *new_context)
--
2.6.1
- [Qemu-block] [PATCH v6 01/39] block: Remove host floppy support, (continued)
- [Qemu-block] [PATCH v6 01/39] block: Remove host floppy support, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 02/39] block: Set BDRV_O_INCOMING in bdrv_fill_options(), Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 03/39] blockdev: Allow creation of BDS trees without BB, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 05/39] block: Make bdrv_is_inserted() return a bool, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 04/39] iotests: Only create BB if necessary, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 07/39] block: Make bdrv_is_inserted() recursive, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 08/39] block/raw_bsd: Drop raw_is_inserted(), Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 09/39] block: Invoke change media CB before NULLing drv, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 10/39] hw/block/fdc: Implement tray status, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 11/39] hw/usb-storage: Check whether BB is inserted, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 12/39] block: Fix BB AIOCB AioContext without BDS,
Max Reitz <=
- [Qemu-block] [PATCH v6 13/39] block: Move guest_block_size into BlockBackend, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 14/39] block: Remove wr_highest_sector from BlockAcctStats, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 15/39] block: Move BlockAcctStats into BlockBackend, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 17/39] block/throttle-groups: Make incref/decref public, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 18/39] block: Add BlockBackendRootState, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 19/39] block: Make some BB functions fall back to BBRS, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 20/39] block: Fail requests to empty BlockBackend, Max Reitz, 2015/10/12