diff mbox

[v2,21/22] block: Strip down bdrv_close_all()

Message ID 1423507124-29809-22-git-send-email-mreitz@redhat.com
State New
Headers show

Commit Message

Max Reitz Feb. 9, 2015, 6:38 p.m. UTC 
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 <mreitz@redhat.com>
---
 block.c                        | 11 +----------
 block/block-backend.c          |  8 ++++++++
 include/sysemu/block-backend.h |  1 +
 3 files changed, 10 insertions(+), 10 deletions(-)
diff mbox

Patch

diff --git a/block.c b/block.c
index 1ab0e29..68d772e 100644
--- a/block.c
+++ b/block.c
@@ -1904,17 +1904,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 e4a4675..287dcf3 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -223,6 +223,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 de54ffa..a4cd28f 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);