From patchwork Sun Nov 27 01:56:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 9448661 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2CC7D60778 for ; Sun, 27 Nov 2016 02:19:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 22F1C2624C for ; Sun, 27 Nov 2016 02:19:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1669526785; Sun, 27 Nov 2016 02:19:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id A24112624C for ; Sun, 27 Nov 2016 02:19:21 +0000 (UTC) Received: from localhost ([::1]:52503 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cAp3o-0002ZT-MI for patchwork-qemu-devel@patchwork.kernel.org; Sat, 26 Nov 2016 21:19:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43241) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cAoiU-0002Lr-Tl for qemu-devel@nongnu.org; Sat, 26 Nov 2016 20:57:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cAoiT-0006zU-Ri for qemu-devel@nongnu.org; Sat, 26 Nov 2016 20:57:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47652) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cAoiP-0006yC-3t; Sat, 26 Nov 2016 20:57:13 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2B2F34E4CF; Sun, 27 Nov 2016 01:57:12 +0000 (UTC) Received: from localhost (ovpn-116-37.phx2.redhat.com [10.3.116.37]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uAR1vAHf027714 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sat, 26 Nov 2016 20:57:11 -0500 From: Max Reitz To: qemu-block@nongnu.org Date: Sun, 27 Nov 2016 02:56:17 +0100 Message-Id: <20161127015622.24105-20-mreitz@redhat.com> In-Reply-To: <20161127015622.24105-1-mreitz@redhat.com> References: <20161127015622.24105-1-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Sun, 27 Nov 2016 01:57:12 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 19/24] block: Add BlockDriver.bdrv_gather_child_options X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Some follow-up patches will rework the way bs->full_open_options is refreshed in bdrv_refresh_filename(). The new implementation will remove the need for the block drivers' bdrv_refresh_filename() implementations to set bs->full_open_options; instead, it will be generic and use static information from each block driver. However, by implementing bdrv_gather_child_options(), block drivers will still be able to override the way the full_open_options of their children are incorporated into their own. We need to implement this function for VMDK because we have to prevent the generic implementation from gathering the options of all children: It is not possible to specify options for the extents through the runtime options. For quorum, the child names that would be used by the generic implementation and the ones that we actually want to use differ. See quorum_gather_child_options() for more information. Signed-off-by: Max Reitz --- block/quorum.c | 30 ++++++++++++++++++++++++++++++ block/vmdk.c | 13 +++++++++++++ include/block/block_int.h | 1 + 3 files changed, 44 insertions(+) diff --git a/block/quorum.c b/block/quorum.c index 0fa803b..126127c 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -1083,6 +1083,35 @@ static void quorum_refresh_filename(BlockDriverState *bs, QDict *options) bs->full_open_options = opts; } +static void quorum_gather_child_options(BlockDriverState *bs, QDict *target) +{ + BDRVQuorumState *s = bs->opaque; + QList *children_list; + int i; + + /* The generic implementation for gathering child options in + * bdrv_refresh_filename() would use the names of the children as specified + * for bdrv_open_child() or bdrv_attach_child(), which is "children.%u" with + * %u being a value (s->next_child_index) that is incremented each time a + * new child is added (and never decremented). Since children can be deleted + * at runtime, there may be gaps in that enumeration. When creating a new + * quorum BDS and specifying the children for it through runtime options, + * the enumeration used there may not have any gaps, though. + * + * Therefore, we have to create a new gap-less enumeration here (which we + * can achieve by simply putting all of the children's full_open_options + * into a QList). + */ + + children_list = qlist_new(); + qdict_put(target, "children", children_list); + + for (i = 0; i < s->num_children; i++) { + QINCREF(s->children[i]->bs->full_open_options); + qlist_append(children_list, s->children[i]->bs->full_open_options); + } +} + static char *quorum_dirname(BlockDriverState *bs, Error **errp) { /* In general, there are multiple BDSs with different dirnames below this @@ -1102,6 +1131,7 @@ static BlockDriver bdrv_quorum = { .bdrv_file_open = quorum_open, .bdrv_close = quorum_close, .bdrv_refresh_filename = quorum_refresh_filename, + .bdrv_gather_child_options = quorum_gather_child_options, .bdrv_dirname = quorum_dirname, .bdrv_co_flush_to_disk = quorum_co_flush, diff --git a/block/vmdk.c b/block/vmdk.c index 6f6932a..87ac4f0 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -2287,6 +2287,18 @@ static int vmdk_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) return 0; } +static void vmdk_gather_child_options(BlockDriverState *bs, QDict *target) +{ + /* No children but file and backing can be explicitly specified */ + QINCREF(bs->file->bs->full_open_options); + qdict_put(target, "file", bs->file->bs->full_open_options); + + if (bs->backing_overridden) { + QINCREF(bs->backing->bs->full_open_options); + qdict_put(target, "backing", bs->backing->bs->full_open_options); + } +} + static QemuOptsList vmdk_create_opts = { .name = "vmdk-create-opts", .head = QTAILQ_HEAD_INITIALIZER(vmdk_create_opts.head), @@ -2356,6 +2368,7 @@ static BlockDriver bdrv_vmdk = { .bdrv_get_specific_info = vmdk_get_specific_info, .bdrv_refresh_limits = vmdk_refresh_limits, .bdrv_get_info = vmdk_get_info, + .bdrv_gather_child_options = vmdk_gather_child_options, .supports_backing = true, .create_opts = &vmdk_create_opts, diff --git a/include/block/block_int.h b/include/block/block_int.h index 5885d9f..cfb8cf3 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -130,6 +130,7 @@ struct BlockDriver { int (*bdrv_make_empty)(BlockDriverState *bs); void (*bdrv_refresh_filename)(BlockDriverState *bs, QDict *options); + void (*bdrv_gather_child_options)(BlockDriverState *bs, QDict *target); char *(*bdrv_dirname)(BlockDriverState *bs, Error **errp); /* aio */