[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 20/22] blockdev: Keep track of monitor-owned BDS
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v2 20/22] blockdev: Keep track of monitor-owned BDS |
Date: |
Mon, 9 Feb 2015 13:38:42 -0500 |
...and release the reference on bdrv_close_all().
Signed-off-by: Max Reitz <address@hidden>
---
block.c | 2 ++
blockdev.c | 24 ++++++++++++++++++++++++
include/block/block_int.h | 2 ++
3 files changed, 28 insertions(+)
diff --git a/block.c b/block.c
index cbe333d..1ab0e29 100644
--- a/block.c
+++ b/block.c
@@ -2016,6 +2016,8 @@ static void bdrv_move_feature_fields(BlockDriverState
*bs_dest,
/* job */
bs_dest->job = bs_src->job;
+ /* keep the same entry in the list of monitor-owned BDS */
+ bs_dest->monitor_list = bs_src->monitor_list;
bs_dest->blk = bs_src->blk;
memcpy(bs_dest->op_blockers, bs_src->op_blockers,
diff --git a/blockdev.c b/blockdev.c
index a6230e0..9a6e645 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -56,6 +56,11 @@ typedef struct BlockdevCloseAllNotifier {
static QTAILQ_HEAD(, BlockdevCloseAllNotifier) close_all_notifiers =
QTAILQ_HEAD_INITIALIZER(close_all_notifiers);
+static Notifier *close_all_bdrv_states_notifier;
+
+static QTAILQ_HEAD(, BlockDriverState) monitor_bdrv_states =
+ QTAILQ_HEAD_INITIALIZER(monitor_bdrv_states);
+
static const char *const if_name[IF_COUNT] = {
[IF_NONE] = "none",
[IF_IDE] = "ide",
@@ -129,6 +134,17 @@ static void blockdev_close_all_notifier(Notifier *n, void
*data)
monitor_blk_unref_with_can(can->blk, can);
}
+static void blockdev_close_all_bdrv_states(Notifier *n, void *data)
+{
+ BlockDriverState *bds, *next_bds;
+
+ QTAILQ_FOREACH_SAFE(bds, &monitor_bdrv_states, monitor_list, next_bds) {
+ bdrv_unref(bds);
+ }
+
+ g_free(n);
+}
+
/**
* Boards may call this to offer board-by-board overrides
* of the default, global values.
@@ -3231,6 +3247,14 @@ void qmp_blockdev_add(BlockdevOptions *options, Error
**errp)
if (!bs) {
goto fail;
}
+
+ QTAILQ_INSERT_TAIL(&monitor_bdrv_states, bs, monitor_list);
+ if (!close_all_bdrv_states_notifier) {
+ close_all_bdrv_states_notifier = g_new0(Notifier, 1);
+ close_all_bdrv_states_notifier->notify =
+ blockdev_close_all_bdrv_states;
+ bdrv_add_close_all_notifier(close_all_bdrv_states_notifier);
+ }
}
if (bs && bdrv_key_required(bs)) {
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 2e9e3e3..8dff7f8 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -380,6 +380,8 @@ struct BlockDriverState {
char node_name[32];
/* element of the list of named nodes building the graph */
QTAILQ_ENTRY(BlockDriverState) node_list;
+ /* element of the list of monitor-owned BDS */
+ QTAILQ_ENTRY(BlockDriverState) monitor_list;
QLIST_HEAD(, BdrvDirtyBitmap) dirty_bitmaps;
int refcnt;
--
2.1.0
- [Qemu-devel] [PATCH v2 07/22] block: Add bdrv_close_all() handlers, (continued)
- [Qemu-devel] [PATCH v2 07/22] block: Add bdrv_close_all() handlers, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 06/22] block: Add bdrv_close_all() notifiers, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 11/22] block: Add blk_name_taken(), Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 14/22] block: Use BlockBackend more, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 12/22] block: Add blk_next_inserted(), Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 13/22] block: Add blk_commit_all() and blk_invalidate_cache_all(), Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 17/22] block: Make bdrv_drain_one() public, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 15/22] blockdev: Add list of monitor-owned BlockBackends, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 18/22] block: Move some bdrv_*_all() functions to BB, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 19/22] block: Remove bdrv_states, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 20/22] blockdev: Keep track of monitor-owned BDS,
Max Reitz <=
- [Qemu-devel] [PATCH v2 16/22] blockdev: Remove blk_hide_on_behalf_of_do_drive_del(), Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 21/22] block: Strip down bdrv_close_all(), Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 22/22] iotests: Add test for multiple BB on BDS tree, Max Reitz, 2015/02/09
- Re: [Qemu-devel] [PATCH v2 00/22] block: Rework bdrv_close_all(), Paolo Bonzini, 2015/02/10