From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56871) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKtEp-0004cV-O4 for qemu-devel@nongnu.org; Mon, 09 Feb 2015 13:39:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YKtEj-0005gW-HJ for qemu-devel@nongnu.org; Mon, 09 Feb 2015 13:39:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44313) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKtEj-0005fp-8e for qemu-devel@nongnu.org; Mon, 09 Feb 2015 13:39:09 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t19Id8Fg022744 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 9 Feb 2015 13:39:08 -0500 From: Max Reitz Date: Mon, 9 Feb 2015 13:38:43 -0500 Message-Id: <1423507124-29809-22-git-send-email-mreitz@redhat.com> In-Reply-To: <1423507124-29809-1-git-send-email-mreitz@redhat.com> References: <1423507124-29809-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v2 21/22] block: Strip down bdrv_close_all() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , Stefan Hajnoczi , Max Reitz 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 --- 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 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); -- 2.1.0