From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, John Snow <jsnow@redhat.com>,
Kevin Wolf <kwolf@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PATCH v2 6/9] block: drop unused BlockDirtyBitmapState->aio_context field
Date: Wed, 6 Dec 2017 14:45:47 +0000 [thread overview]
Message-ID: <20171206144550.22295-7-stefanha@redhat.com> (raw)
In-Reply-To: <20171206144550.22295-1-stefanha@redhat.com>
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 <stefanha@redhat.com>
---
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
next prev parent reply other threads:[~2017-12-06 14:47 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-06 14:45 [Qemu-devel] [PATCH v2 0/9] blockdev: fix QMP 'transaction' with IOThreads Stefan Hajnoczi
2017-12-06 14:45 ` [Qemu-devel] [PATCH v2 1/9] blockdev: hold AioContext for bdrv_unref() in external_snapshot_clean() Stefan Hajnoczi
2017-12-07 20:32 ` Eric Blake
2017-12-06 14:45 ` [Qemu-devel] [PATCH v2 2/9] block: don't keep AioContext acquired after external_snapshot_prepare() Stefan Hajnoczi
2017-12-07 20:37 ` Eric Blake
2017-12-06 14:45 ` [Qemu-devel] [PATCH v2 3/9] block: don't keep AioContext acquired after drive_backup_prepare() Stefan Hajnoczi
2017-12-07 21:27 ` Eric Blake
2017-12-06 14:45 ` [Qemu-devel] [PATCH v2 4/9] block: don't keep AioContext acquired after blockdev_backup_prepare() Stefan Hajnoczi
2017-12-07 21:39 ` Eric Blake
2017-12-06 14:45 ` [Qemu-devel] [PATCH v2 5/9] block: don't keep AioContext acquired after internal_snapshot_prepare() Stefan Hajnoczi
2017-12-07 21:46 ` Eric Blake
2017-12-06 14:45 ` Stefan Hajnoczi [this message]
2017-12-07 21:47 ` [Qemu-devel] [PATCH v2 6/9] block: drop unused BlockDirtyBitmapState->aio_context field Eric Blake
2017-12-06 14:45 ` [Qemu-devel] [PATCH v2 7/9] iothread: add iothread_by_id() API Stefan Hajnoczi
2017-12-07 21:48 ` Eric Blake
2017-12-06 14:45 ` [Qemu-devel] [PATCH v2 8/9] blockdev: add x-blockdev-set-iothread testing command Stefan Hajnoczi
2017-12-07 21:54 ` Eric Blake
2017-12-06 14:45 ` [Qemu-devel] [PATCH v2 9/9] qemu-iotests: add 202 external snapshots IOThread test Stefan Hajnoczi
2017-12-07 21:58 ` Eric Blake
2017-12-08 10:19 ` [Qemu-devel] [Qemu-block] [PATCH v2 0/9] blockdev: fix QMP 'transaction' with IOThreads Stefan Hajnoczi
2017-12-08 13:29 ` [Qemu-devel] " Kevin Wolf
2017-12-08 15:32 ` Stefan Hajnoczi
2017-12-13 21:26 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171206144550.22295-7-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).