[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 12/23] block: drop unused BlockDirtyBitmapState->a
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL v2 12/23] block: drop unused BlockDirtyBitmapState->aio_context field |
Date: |
Tue, 19 Dec 2017 15:11:33 +0000 |
The dirty bitmap actions in qmp_transaction have not used AioContext
since the dirty bitmap locking discipline was introduced in commit
2119882c7eb7e2c612b24fc0c8d86f5887d6f1c3 ("block: introduce
dirty_bitmap_mutex"). Remove the unused field.
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
blockdev.c | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 6332a249ea..e865ae4873 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2049,7 +2049,6 @@ typedef struct BlockDirtyBitmapState {
BlkActionState common;
BdrvDirtyBitmap *bitmap;
BlockDriverState *bs;
- AioContext *aio_context;
HBitmap *backup;
bool prepared;
} BlockDirtyBitmapState;
@@ -2128,7 +2127,6 @@ static void
block_dirty_bitmap_clear_prepare(BlkActionState *common,
}
bdrv_clear_dirty_bitmap(state->bitmap, &state->backup);
- /* AioContext is released in .clean() */
}
static void block_dirty_bitmap_clear_abort(BlkActionState *common)
@@ -2149,16 +2147,6 @@ static void
block_dirty_bitmap_clear_commit(BlkActionState *common)
hbitmap_free(state->backup);
}
-static void block_dirty_bitmap_clear_clean(BlkActionState *common)
-{
- BlockDirtyBitmapState *state = DO_UPCAST(BlockDirtyBitmapState,
- common, common);
-
- if (state->aio_context) {
- aio_context_release(state->aio_context);
- }
-}
-
static void abort_prepare(BlkActionState *common, Error **errp)
{
error_setg(errp, "Transaction aborted using Abort action");
@@ -2219,7 +2207,6 @@ static const BlkActionOps actions[] = {
.prepare = block_dirty_bitmap_clear_prepare,
.commit = block_dirty_bitmap_clear_commit,
.abort = block_dirty_bitmap_clear_abort,
- .clean = block_dirty_bitmap_clear_clean,
}
};
--
2.14.3
- [Qemu-devel] [PULL v2 02/23] hw/block/nvme: Convert to realize, (continued)
- [Qemu-devel] [PULL v2 02/23] hw/block/nvme: Convert to realize, Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 03/23] hw/block: Fix the return type, Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 04/23] hw/block: Use errp directly rather than local_err, Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 05/23] dev-storage: Fix the unusual function name, Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 06/23] qdev: drop unused #include "sysemu/iothread.h", Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 07/23] blockdev: hold AioContext for bdrv_unref() in external_snapshot_clean(), Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 08/23] block: don't keep AioContext acquired after external_snapshot_prepare(), Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 10/23] block: don't keep AioContext acquired after blockdev_backup_prepare(), Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 11/23] block: don't keep AioContext acquired after internal_snapshot_prepare(), Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 09/23] block: don't keep AioContext acquired after drive_backup_prepare(), Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 12/23] block: drop unused BlockDirtyBitmapState->aio_context field,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL v2 13/23] iothread: add iothread_by_id() API, Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 14/23] blockdev: add x-blockdev-set-iothread testing command, Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 15/23] qemu-iotests: add 202 external snapshots IOThread test, Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 18/23] block: avoid recursive AioContext acquire in bdrv_inactivate_all(), Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 16/23] virtio-blk: make queue size configurable, Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 17/23] virtio-blk: reject configs with logical block size > physical block size, Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 20/23] blockdev: add x-blockdev-set-iothread force boolean, Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 19/23] docs: mark nested AioContext locking as a legacy API, Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 21/23] iotests: add VM.add_object(), Stefan Hajnoczi, 2017/12/19
- [Qemu-devel] [PULL v2 23/23] qemu-iotests: add 203 savevm with IOThreads test, Stefan Hajnoczi, 2017/12/19