[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v5 10/13] blockdev: Keep track of monitor-owned BDS
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v5 10/13] blockdev: Keep track of monitor-owned BDS |
Date: |
Tue, 3 Mar 2015 15:13:08 -0500 |
Signed-off-by: Max Reitz <address@hidden>
---
block.c | 2 ++
blockdev.c | 18 ++++++++++++++++++
include/block/block_int.h | 4 ++++
stubs/Makefile.objs | 1 +
stubs/blockdev-close-all-bdrv-states.c | 5 +++++
5 files changed, 30 insertions(+)
create mode 100644 stubs/blockdev-close-all-bdrv-states.c
diff --git a/block.c b/block.c
index 9698b1d..fce9d5d 100644
--- a/block.c
+++ b/block.c
@@ -2097,6 +2097,8 @@ static void bdrv_move_feature_fields(BlockDriverState
*bs_dest,
bs_dest->device_list = bs_src->device_list;
/* keep the same entry in all_bdrv_states */
bs_dest->bs_list = bs_src->bs_list;
+ /* 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;
diff --git a/blockdev.c b/blockdev.c
index 546acfe..a4283a7 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -47,6 +47,9 @@
#include "trace.h"
#include "sysemu/arch_init.h"
+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",
@@ -646,6 +649,19 @@ fail:
return NULL;
}
+void blockdev_close_all_bdrv_states(void)
+{
+ BlockDriverState *bs, *next_bs;
+
+ QTAILQ_FOREACH_SAFE(bs, &monitor_bdrv_states, monitor_list, next_bs) {
+ AioContext *ctx = bdrv_get_aio_context(bs);
+
+ aio_context_acquire(ctx);
+ bdrv_unref(bs);
+ aio_context_release(ctx);
+ }
+}
+
static void qemu_opt_rename(QemuOpts *opts, const char *from, const char *to,
Error **errp)
{
@@ -3161,6 +3177,8 @@ void qmp_blockdev_add(BlockdevOptions *options, Error
**errp)
if (!bs) {
goto fail;
}
+
+ QTAILQ_INSERT_TAIL(&monitor_bdrv_states, bs, monitor_list);
}
if (bs && bdrv_key_required(bs)) {
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 622fbfc..f9968da 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -401,6 +401,8 @@ struct BlockDriverState {
QTAILQ_ENTRY(BlockDriverState) device_list;
/* element of the list of all BlockDriverStates (all_bdrv_states) */
QTAILQ_ENTRY(BlockDriverState) bs_list;
+ /* element of the list of monitor-owned BDS */
+ QTAILQ_ENTRY(BlockDriverState) monitor_list;
QLIST_HEAD(, BdrvDirtyBitmap) dirty_bitmaps;
int refcnt;
@@ -624,4 +626,6 @@ bool blk_dev_is_tray_open(BlockBackend *blk);
bool blk_dev_is_medium_locked(BlockBackend *blk);
void blk_dev_resize_cb(BlockBackend *blk);
+void blockdev_close_all_bdrv_states(void);
+
#endif /* BLOCK_INT_H */
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index 5e347d0..9169a09 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -1,5 +1,6 @@
stub-obj-y += arch-query-cpu-def.o
stub-obj-y += bdrv-commit-all.o
+stub-obj-y += blockdev-close-all-bdrv-states.o
stub-obj-y += chr-baum-init.o
stub-obj-y += chr-msmouse.o
stub-obj-y += chr-testdev.o
diff --git a/stubs/blockdev-close-all-bdrv-states.c
b/stubs/blockdev-close-all-bdrv-states.c
new file mode 100644
index 0000000..12d2442
--- /dev/null
+++ b/stubs/blockdev-close-all-bdrv-states.c
@@ -0,0 +1,5 @@
+#include "block/block_int.h"
+
+void blockdev_close_all_bdrv_states(void)
+{
+}
--
2.1.0
- Re: [Qemu-block] [PATCH v5 01/13] iotests: Move _filter_nbd into common.filter, (continued)
- [Qemu-block] [PATCH v5 03/13] iotests: Add test for eject under NBD server, Max Reitz, 2015/03/03
- [Qemu-block] [PATCH v5 05/13] block: Move BDS close notifiers into BB, Max Reitz, 2015/03/03
- [Qemu-block] [PATCH v5 08/13] block: Make bdrv_close() static, Max Reitz, 2015/03/03
- [Qemu-block] [PATCH v5 04/13] quorum: Fix close path, Max Reitz, 2015/03/03
- [Qemu-block] [PATCH v5 13/13] iotests: Add test for multiple BB on BDS tree, Max Reitz, 2015/03/03
- [Qemu-block] [PATCH v5 10/13] blockdev: Keep track of monitor-owned BDS,
Max Reitz <=
- [Qemu-block] [PATCH v5 11/13] block: Add blk_remove_all_bs(), Max Reitz, 2015/03/03
- [Qemu-block] [PATCH v5 09/13] block: Add list of all BlockDriverStates, Max Reitz, 2015/03/03
- [Qemu-block] [PATCH v5 12/13] block: Rewrite bdrv_close_all(), Max Reitz, 2015/03/03
- Re: [Qemu-block] [PATCH v5 00/13] block: Rework bdrv_close_all(), Kevin Wolf, 2015/03/04