From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
qemu-block@nongnu.org, jcody@redhat.com, armbru@redhat.com,
mreitz@redhat.com, Stefan Hajnoczi <stefanha@redhat.com>,
pbonzini@redhat.com
Subject: [Qemu-devel] [RFC PATCH 3/7] block: Add op blocker notifier list
Date: Wed, 6 May 2015 19:23:35 +0800 [thread overview]
Message-ID: <1430911419-8256-4-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1430911419-8256-1-git-send-email-famz@redhat.com>
BDS users can register a notifier and get notified about op blocker
changes.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
block.c | 20 ++++++++++++++++++++
include/block/block.h | 8 ++++++++
include/block/block_int.h | 3 +++
3 files changed, 31 insertions(+)
diff --git a/block.c b/block.c
index 7904098..054ddb4 100644
--- a/block.c
+++ b/block.c
@@ -3375,6 +3375,12 @@ struct BdrvOpBlocker {
QLIST_ENTRY(BdrvOpBlocker) list;
};
+void bdrv_op_blocker_add_notifier(BlockDriverState *bs,
+ Notifier *notifier)
+{
+ notifier_list_add(&bs->op_blocker_notifiers, notifier);
+}
+
bool bdrv_op_is_blocked(BlockDriverState *bs, BlockOpType op, Error **errp)
{
BdrvOpBlocker *blocker;
@@ -3391,11 +3397,24 @@ bool bdrv_op_is_blocked(BlockDriverState *bs, BlockOpType op, Error **errp)
return false;
}
+static void bdrv_op_blocker_notify(BlockDriverState *bs, BlockOpType op,
+ Error *reason, bool blocking)
+{
+ BlockOpEvent event = (BlockOpEvent) {
+ op = op,
+ reason = reason,
+ blocking = true,
+ };
+
+ notifier_list_notify(&bs->op_blocker_notifiers, &event);
+}
+
void bdrv_op_block(BlockDriverState *bs, BlockOpType op, Error *reason)
{
BdrvOpBlocker *blocker;
assert((int) op >= 0 && op < BLOCK_OP_TYPE_MAX);
+ bdrv_op_blocker_notify(bs, op, reason, true);
blocker = g_new0(BdrvOpBlocker, 1);
blocker->reason = reason;
QLIST_INSERT_HEAD(&bs->op_blockers[op], blocker, list);
@@ -3405,6 +3424,7 @@ void bdrv_op_unblock(BlockDriverState *bs, BlockOpType op, Error *reason)
{
BdrvOpBlocker *blocker, *next;
assert((int) op >= 0 && op < BLOCK_OP_TYPE_MAX);
+ bdrv_op_blocker_notify(bs, op, reason, false);
QLIST_FOREACH_SAFE(blocker, &bs->op_blockers[op], list, next) {
if (blocker->reason == reason) {
QLIST_REMOVE(blocker, list);
diff --git a/include/block/block.h b/include/block/block.h
index 906fb31..3420b2c 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -163,6 +163,12 @@ typedef enum BlockOpType {
BLOCK_OP_TYPE_MAX,
} BlockOpType;
+typedef struct {
+ BlockOpType type;
+ Error *reason;
+ bool blocking;
+} BlockOpEvent;
+
void bdrv_iostatus_enable(BlockDriverState *bs);
void bdrv_iostatus_reset(BlockDriverState *bs);
void bdrv_iostatus_disable(BlockDriverState *bs);
@@ -491,6 +497,8 @@ void bdrv_disable_copy_on_read(BlockDriverState *bs);
void bdrv_ref(BlockDriverState *bs);
void bdrv_unref(BlockDriverState *bs);
+void bdrv_op_blocker_add_notifier(BlockDriverState *bs,
+ Notifier *notifier);
bool bdrv_op_is_blocked(BlockDriverState *bs, BlockOpType op, Error **errp);
void bdrv_op_block(BlockDriverState *bs, BlockOpType op, Error *reason);
void bdrv_op_unblock(BlockDriverState *bs, BlockOpType op, Error *reason);
diff --git a/include/block/block_int.h b/include/block/block_int.h
index db29b74..195ae30 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -418,6 +418,9 @@ struct BlockDriverState {
/* operation blockers */
QLIST_HEAD(, BdrvOpBlocker) op_blockers[BLOCK_OP_TYPE_MAX];
+ /* Callback before any op blocker change */
+ NotifierList op_blocker_notifiers;
+
/* long-running background operation */
BlockJob *job;
--
1.9.3
next prev parent reply other threads:[~2015-05-06 11:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-06 11:23 [Qemu-devel] [RFC PATCH 0/7] Fix transactional snapshot with virtio-blk dataplane Fam Zheng
2015-05-06 11:23 ` [Qemu-devel] [RFC PATCH 1/7] block: Add op blocker type "device IO" Fam Zheng
2015-05-06 11:23 ` [Qemu-devel] [RFC PATCH 2/7] block: Block "device IO" during bdrv_drain and bdrv_drain_all Fam Zheng
2015-05-06 11:23 ` Fam Zheng [this message]
2015-05-06 14:22 ` [Qemu-devel] [RFC PATCH 3/7] block: Add op blocker notifier list Paolo Bonzini
2015-05-06 15:03 ` Fam Zheng
2015-05-06 11:23 ` [Qemu-devel] [RFC PATCH 4/7] block-backend: Add blk_op_blocker_add_notifier Fam Zheng
2015-05-06 11:23 ` [Qemu-devel] [RFC PATCH 5/7] virtio-blk: Move complete_request to 'ops' structure Fam Zheng
2015-05-06 11:23 ` [Qemu-devel] [RFC PATCH 6/7] virtio-blk: Don't handle output when there is "device IO" op blocker Fam Zheng
2015-05-06 12:07 ` Paolo Bonzini
2015-05-06 12:20 ` Fam Zheng
2015-05-06 14:18 ` Paolo Bonzini
2015-05-06 11:23 ` [Qemu-devel] [RFC PATCH 7/7] blockdev: Add "device IO" op blocker during snapshot transaction Fam Zheng
2015-05-07 13:43 ` [Qemu-devel] [Qemu-block] [RFC PATCH 0/7] Fix transactional snapshot with virtio-blk dataplane Stefan Hajnoczi
2015-05-08 8:46 ` Stefan Hajnoczi
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=1430911419-8256-4-git-send-email-famz@redhat.com \
--to=famz@redhat.com \
--cc=armbru@redhat.com \
--cc=jcody@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/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).