[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v10 04/10] block: make bdrv_put_ref_bh_schedule() as
From: |
Wen Congyang |
Subject: |
[Qemu-block] [PATCH v10 04/10] block: make bdrv_put_ref_bh_schedule() as a public API |
Date: |
Fri, 25 Sep 2015 14:17:32 +0800 |
Signed-off-by: Wen Congyang <address@hidden>
---
block.c | 25 +++++++++++++++++++++++++
blockdev.c | 37 ++++++-------------------------------
include/block/block.h | 1 +
3 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/block.c b/block.c
index 328c52f..f9a985c 100644
--- a/block.c
+++ b/block.c
@@ -3597,6 +3597,31 @@ void bdrv_unref(BlockDriverState *bs)
}
}
+typedef struct {
+ QEMUBH *bh;
+ BlockDriverState *bs;
+} BDRVPutRefBH;
+
+static void bdrv_put_ref_bh(void *opaque)
+{
+ BDRVPutRefBH *s = opaque;
+
+ bdrv_unref(s->bs);
+ qemu_bh_delete(s->bh);
+ g_free(s);
+}
+
+/* Release a BDS reference in a BH */
+void bdrv_put_ref_bh_schedule(BlockDriverState *bs)
+{
+ BDRVPutRefBH *s;
+
+ s = g_new(BDRVPutRefBH, 1);
+ s->bh = qemu_bh_new(bdrv_put_ref_bh, s);
+ s->bs = bs;
+ qemu_bh_schedule(s->bh);
+}
+
struct BdrvOpBlocker {
Error *reason;
QLIST_ENTRY(BdrvOpBlocker) list;
diff --git a/blockdev.c b/blockdev.c
index 3289cc3..11bc992 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -278,37 +278,6 @@ static void bdrv_format_print(void *opaque, const char
*name)
error_printf(" %s", name);
}
-typedef struct {
- QEMUBH *bh;
- BlockDriverState *bs;
-} BDRVPutRefBH;
-
-static void bdrv_put_ref_bh(void *opaque)
-{
- BDRVPutRefBH *s = opaque;
-
- bdrv_unref(s->bs);
- qemu_bh_delete(s->bh);
- g_free(s);
-}
-
-/*
- * Release a BDS reference in a BH
- *
- * It is not safe to use bdrv_unref() from a callback function when the callers
- * still need the BlockDriverState. In such cases we schedule a BH to release
- * the reference.
- */
-static void bdrv_put_ref_bh_schedule(BlockDriverState *bs)
-{
- BDRVPutRefBH *s;
-
- s = g_new(BDRVPutRefBH, 1);
- s->bh = qemu_bh_new(bdrv_put_ref_bh, s);
- s->bs = bs;
- qemu_bh_schedule(s->bh);
-}
-
static int parse_block_error_action(const char *buf, bool is_read, Error
**errp)
{
if (!strcmp(buf, "ignore")) {
@@ -2534,6 +2503,12 @@ static void block_job_cb(void *opaque, int ret)
block_job_event_completed(bs->job, msg);
}
+
+ /*
+ * It is not safe to use bdrv_unref() from a callback function when the
+ * callers still need the BlockDriverState. In such cases we schedule
+ * a BH to release the reference.
+ */
bdrv_put_ref_bh_schedule(bs);
}
diff --git a/include/block/block.h b/include/block/block.h
index e4be19f..5154388 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -505,6 +505,7 @@ void bdrv_unref_child(BlockDriverState *parent, BdrvChild
*child);
BdrvChild *bdrv_attach_child(BlockDriverState *parent_bs,
BlockDriverState *child_bs,
const BdrvChildRole *child_role);
+void bdrv_put_ref_bh_schedule(BlockDriverState *bs);
bool bdrv_op_is_blocked(BlockDriverState *bs, BlockOpType op, Error **errp);
void bdrv_op_block(BlockDriverState *bs, BlockOpType op, Error *reason);
--
2.4.3
- [Qemu-block] [PATCH v10 00/10] Block replication for continuous checkpoints, Wen Congyang, 2015/09/25
- [Qemu-block] [PATCH v10 02/10] Backup: clear all bitmap when doing block checkpoint, Wen Congyang, 2015/09/25
- [Qemu-block] [PATCH v10 01/10] allow writing to the backing file, Wen Congyang, 2015/09/25
- [Qemu-block] [PATCH v10 03/10] Allow creating backup jobs when opening BDS, Wen Congyang, 2015/09/25
- [Qemu-block] [PATCH v10 04/10] block: make bdrv_put_ref_bh_schedule() as a public API,
Wen Congyang <=
- [Qemu-block] [PATCH v10 06/10] Add new block driver interfaces to control block replication, Wen Congyang, 2015/09/25
- [Qemu-block] [PATCH v10 07/10] quorum: implement block driver interfaces for block replication, Wen Congyang, 2015/09/25
- [Qemu-block] [PATCH v10 09/10] support replication driver in blockdev-add, Wen Congyang, 2015/09/25
- [Qemu-block] [PATCH v10 05/10] docs: block replication's description, Wen Congyang, 2015/09/25
- [Qemu-block] [PATCH v10 10/10] Add a new API to start/stop replication, do checkpoint to all BDSes, Wen Congyang, 2015/09/25
- [Qemu-block] [PATCH v10 08/10] Implement new driver for block replication, Wen Congyang, 2015/09/25