[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/21] block: Strip down bdrv_close_all()
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 19/21] block: Strip down bdrv_close_all() |
Date: |
Mon, 26 Jan 2015 14:27:46 -0500 |
References to all BlockBackends and BlockDriverStates are now released
by their respective holders; force-closing them is no longer necessary.
Signed-off-by: Max Reitz <address@hidden>
---
block.c | 11 +----------
block/block-backend.c | 8 ++++++++
include/sysemu/block-backend.h | 1 +
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/block.c b/block.c
index f096577..747b92f 100644
--- a/block.c
+++ b/block.c
@@ -1903,17 +1903,8 @@ static void bdrv_close(BlockDriverState *bs)
void bdrv_close_all(void)
{
- BlockBackend *blk = NULL;
-
notifier_list_notify(&close_all_notifiers, NULL);
-
- while ((blk = blk_next_inserted(blk)) != NULL) {
- AioContext *aio_context = blk_get_aio_context(blk);
-
- aio_context_acquire(aio_context);
- bdrv_close(blk_bs(blk));
- aio_context_release(aio_context);
- }
+ blk_close_all_finalize();
}
void bdrv_add_close_all_notifier(Notifier *notifier)
diff --git a/block/block-backend.c b/block/block-backend.c
index 9a00645..242dea4 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -220,6 +220,14 @@ void blk_unref(BlockBackend *blk, Notifier
*close_all_notifier)
}
/*
+ * For use by bdrv_close_all()
+ */
+void blk_close_all_finalize(void)
+{
+ assert(QTAILQ_EMPTY(&blk_backends));
+}
+
+/*
* Return the BlockBackend after @blk.
* If @blk is null, return the first one.
* Else, return @blk's next sibling, which may be null.
diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
index 960e57d..1a05dbb 100644
--- a/include/sysemu/block-backend.h
+++ b/include/sysemu/block-backend.h
@@ -70,6 +70,7 @@ BlockBackend *blk_new_open(const char *name, const char
*filename,
Notifier *close_all_notifier, Error **errp);
void blk_ref(BlockBackend *blk, Notifier *close_all_notifier);
void blk_unref(BlockBackend *blk, Notifier *close_all_notifier);
+void blk_close_all_finalize(void);
const char *blk_name(BlockBackend *blk);
BlockBackend *blk_by_name(const char *name);
bool blk_name_taken(const char *name);
--
2.1.0
- [Qemu-devel] [PATCH 16/21] block: Move some bdrv_*_all() functions to BB, (continued)
- [Qemu-devel] [PATCH 16/21] block: Move some bdrv_*_all() functions to BB, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 12/21] block: Use BlockBackend more, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 15/21] block: Make bdrv_drain_one() public, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 11/21] block: Add blk_commit_all() and blk_invalidate_cache_all(), Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 17/21] block: Remove bdrv_states, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 13/21] blockdev: Add list of monitor-owned BlockBackends, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 19/21] block: Strip down bdrv_close_all(),
Max Reitz <=
- [Qemu-devel] [PATCH 18/21] blockdev: Keep track of monitor-owned BDS, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 20/21] iotests: Add "wait" functionality to _cleanup_qemu, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 21/21] iotests: Add test for multiple BB on BDS tree, Max Reitz, 2015/01/26
- Re: [Qemu-devel] [PATCH 00/20] block: Rework bdrv_close_all(), Max Reitz, 2015/01/26