From patchwork Tue Feb 16 18:08:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 8330381 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 41E81C02AA for ; Tue, 16 Feb 2016 18:09:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A1888202A1 for ; Tue, 16 Feb 2016 18:09:19 +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 EA16520295 for ; Tue, 16 Feb 2016 18:09:18 +0000 (UTC) Received: from localhost ([::1]:49124 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVk3q-000089-6z for patchwork-qemu-devel@patchwork.kernel.org; Tue, 16 Feb 2016 13:09:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45276) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVk3W-0008Nx-Cp for qemu-devel@nongnu.org; Tue, 16 Feb 2016 13:08:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aVk3V-0005cQ-Ca for qemu-devel@nongnu.org; Tue, 16 Feb 2016 13:08:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40076) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVk3Q-0005au-4Q; Tue, 16 Feb 2016 13:08:52 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id D81CC2C9DA7; Tue, 16 Feb 2016 18:08:51 +0000 (UTC) Received: from localhost (ovpn-116-109.ams2.redhat.com [10.36.116.109]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1GI8orH000314 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 16 Feb 2016 13:08:51 -0500 From: Max Reitz To: qemu-block@nongnu.org Date: Tue, 16 Feb 2016 19:08:22 +0100 Message-Id: <1455646106-2047-11-git-send-email-mreitz@redhat.com> In-Reply-To: <1455646106-2047-1-git-send-email-mreitz@redhat.com> References: <1455646106-2047-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Markus Armbruster , qemu-devel@nongnu.org, Stefan Hajnoczi , Max Reitz Subject: [Qemu-devel] [PATCH v3 10/14] block: Add bdrv_next_monitor_owned() 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 Add a function for iterating over all monitor-owned BlockDriverStates so the generic block layer can do so. Signed-off-by: Max Reitz --- blockdev.c | 7 +++++++ include/block/block.h | 1 + stubs/Makefile.objs | 1 + stubs/bdrv-next-monitor-owned.c | 6 ++++++ 4 files changed, 15 insertions(+) create mode 100644 stubs/bdrv-next-monitor-owned.c diff --git a/blockdev.c b/blockdev.c index 6b929a9..6370490 100644 --- a/blockdev.c +++ b/blockdev.c @@ -722,6 +722,13 @@ void blockdev_close_all_bdrv_states(void) } } +/* Iterates over the list of monitor-owned BlockDriverStates */ +BlockDriverState *bdrv_next_monitor_owned(BlockDriverState *bs) +{ + return bs ? QTAILQ_NEXT(bs, monitor_list) + : QTAILQ_FIRST(&monitor_bdrv_states); +} + static void qemu_opt_rename(QemuOpts *opts, const char *from, const char *to, Error **errp) { diff --git a/include/block/block.h b/include/block/block.h index db9e0f5..bd27e6c 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -413,6 +413,7 @@ BlockDriverState *bdrv_lookup_bs(const char *device, bool bdrv_chain_contains(BlockDriverState *top, BlockDriverState *base); BlockDriverState *bdrv_next_node(BlockDriverState *bs); BlockDriverState *bdrv_next(BlockDriverState *bs); +BlockDriverState *bdrv_next_monitor_owned(BlockDriverState *bs); int bdrv_is_encrypted(BlockDriverState *bs); int bdrv_key_required(BlockDriverState *bs); int bdrv_set_key(BlockDriverState *bs, const char *key); diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 9d9f1d0..b6d1e65 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -1,4 +1,5 @@ stub-obj-y += arch-query-cpu-def.o +stub-obj-y += bdrv-next-monitor-owned.o stub-obj-y += blk-commit-all.o stub-obj-y += blockdev-close-all-bdrv-states.o stub-obj-y += clock-warp.o diff --git a/stubs/bdrv-next-monitor-owned.c b/stubs/bdrv-next-monitor-owned.c new file mode 100644 index 0000000..09028db --- /dev/null +++ b/stubs/bdrv-next-monitor-owned.c @@ -0,0 +1,6 @@ +#include "block/block.h" + +BlockDriverState *bdrv_next_monitor_owned(BlockDriverState *bs) +{ + return NULL; +}