ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: drop unused BlockDirtyBitmapState->aio_context field 

The dirty bitmap actions in qmp_transaction have not used AioContext
since the dirty bitmap locking discipline was introduced in commit
2119882c7e ("block: introduce
dirty_bitmap_mutex").  Remove the unused field.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20171206144550.22295-7-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2017-12-06 14:45:47 +00:00
parent a36e458cdd
commit 5016f21b70
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
blockdev.c
View File

@ -2049,7 +2049,6 @@ typedef struct BlockDirtyBitmapState {
BlkActionState common; BlkActionState common;
BdrvDirtyBitmap *bitmap; BdrvDirtyBitmap *bitmap;
BlockDriverState *bs; BlockDriverState *bs;
AioContext *aio_context;
HBitmap *backup; HBitmap *backup;
bool prepared; bool prepared;
} BlockDirtyBitmapState; } BlockDirtyBitmapState;
@ -2128,7 +2127,6 @@ static void block_dirty_bitmap_clear_prepare(BlkActionState *common,
} }
bdrv_clear_dirty_bitmap(state->bitmap, &state->backup); bdrv_clear_dirty_bitmap(state->bitmap, &state->backup);
/* AioContext is released in .clean() */
} }
static void block_dirty_bitmap_clear_abort(BlkActionState *common) 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); 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) static void abort_prepare(BlkActionState *common, Error **errp)
{ {
error_setg(errp, "Transaction aborted using Abort action"); error_setg(errp, "Transaction aborted using Abort action");
@ -2219,7 +2207,6 @@ static const BlkActionOps actions[] = {
.prepare = block_dirty_bitmap_clear_prepare, .prepare = block_dirty_bitmap_clear_prepare,
.commit = block_dirty_bitmap_clear_commit, .commit = block_dirty_bitmap_clear_commit,
.abort = block_dirty_bitmap_clear_abort, .abort = block_dirty_bitmap_clear_abort,
.clean = block_dirty_bitmap_clear_clean,
} }
}; };