From patchwork Fri Jan 29 15:36:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 8164481 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3D428BEEE5 for ; Fri, 29 Jan 2016 15:41:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A156520383 for ; Fri, 29 Jan 2016 15:41:55 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E4EA320390 for ; Fri, 29 Jan 2016 15:41:53 +0000 (UTC) Received: from localhost ([::1]:34864 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPBBJ-0002dB-8i for patchwork-qemu-devel@patchwork.kernel.org; Fri, 29 Jan 2016 10:41:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42828) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPB6Q-0001R2-Uq for qemu-devel@nongnu.org; Fri, 29 Jan 2016 10:36:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aPB6M-0006fX-D5 for qemu-devel@nongnu.org; Fri, 29 Jan 2016 10:36:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:27234) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPB6K-0006f9-AG; Fri, 29 Jan 2016 10:36:44 -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 (Postfix) with ESMTPS id E7392345380; Fri, 29 Jan 2016 15:36:43 +0000 (UTC) Received: from localhost (ovpn-116-55.ams2.redhat.com [10.36.116.55]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0TFagq8004302 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 29 Jan 2016 10:36:43 -0500 From: Max Reitz To: qemu-block@nongnu.org Date: Fri, 29 Jan 2016 16:36:11 +0100 Message-Id: <1454081776-30130-12-git-send-email-mreitz@redhat.com> In-Reply-To: <1454081776-30130-1-git-send-email-mreitz@redhat.com> References: <1454081776-30130-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Fam Zheng , qemu-devel@nongnu.org, Max Reitz , Paolo Bonzini , Alberto Garcia , John Snow Subject: [Qemu-devel] [PATCH v9 11/16] block: Add list of all BlockDriverStates X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We need this list so that bdrv_close_all() can keep track of which BDSs are still open after having removed the BDSs from all of the BBs and having released all monitor BDS references. Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Reviewed-by: Fam Zheng --- block.c | 7 +++++++ include/block/block_int.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/block.c b/block.c index e076f10..d687d2c 100644 --- a/block.c +++ b/block.c @@ -79,6 +79,9 @@ struct BdrvStates bdrv_states = QTAILQ_HEAD_INITIALIZER(bdrv_states); static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states = QTAILQ_HEAD_INITIALIZER(graph_bdrv_states); +static QTAILQ_HEAD(, BlockDriverState) all_bdrv_states = + QTAILQ_HEAD_INITIALIZER(all_bdrv_states); + static QLIST_HEAD(, BlockDriver) bdrv_drivers = QLIST_HEAD_INITIALIZER(bdrv_drivers); @@ -267,6 +270,8 @@ BlockDriverState *bdrv_new(void) bs->refcnt = 1; bs->aio_context = qemu_get_aio_context(); + QTAILQ_INSERT_TAIL(&all_bdrv_states, bs, bs_list); + return bs; } @@ -2371,6 +2376,8 @@ static void bdrv_delete(BlockDriverState *bs) /* remove from list, if necessary */ bdrv_make_anon(bs); + QTAILQ_REMOVE(&all_bdrv_states, bs, bs_list); + g_free(bs); } diff --git a/include/block/block_int.h b/include/block/block_int.h index 2db8c79..26c4e74 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -444,6 +444,8 @@ struct BlockDriverState { QTAILQ_ENTRY(BlockDriverState) node_list; /* element of the list of "drives" the guest sees */ QTAILQ_ENTRY(BlockDriverState) device_list; + /* element of the list of all BlockDriverStates (all_bdrv_states) */ + QTAILQ_ENTRY(BlockDriverState) bs_list; QLIST_HEAD(, BdrvDirtyBitmap) dirty_bitmaps; int refcnt;