From nobody Tue Feb 10 03:37:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520583097722368.4017161153197; Fri, 9 Mar 2018 00:11:37 -0800 (PST) Received: from localhost ([::1]:43716 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euD7k-0002sw-Mi for importer@patchew.org; Fri, 09 Mar 2018 03:11:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60305) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euD5q-0001hf-Jr for qemu-devel@nongnu.org; Fri, 09 Mar 2018 03:09:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1euD5p-0008OW-NA for qemu-devel@nongnu.org; Fri, 09 Mar 2018 03:09:34 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:57668 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1euD5k-0008Mr-C6; Fri, 09 Mar 2018 03:09:28 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0EA384026779; Fri, 9 Mar 2018 08:09:28 +0000 (UTC) Received: from lemon.usersys.redhat.com (ovpn-12-195.pek2.redhat.com [10.72.12.195]) by smtp.corp.redhat.com (Postfix) with ESMTP id 305B210B0F20; Fri, 9 Mar 2018 08:09:25 +0000 (UTC) From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 9 Mar 2018 16:09:09 +0800 Message-Id: <20180309080910.7274-4-famz@redhat.com> In-Reply-To: <20180309080910.7274-1-famz@redhat.com> References: <20180309080910.7274-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Fri, 09 Mar 2018 08:09:28 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Fri, 09 Mar 2018 08:09:28 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'famz@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 3/4] block: Use the actual current_flags during reopen 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 , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This complies to the function contract and allows bdrv_backing_options to make the right decision. Signed-off-by: Fam Zheng --- block.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/block.c b/block.c index 937f9fe159..1e2b0d822d 100644 --- a/block.c +++ b/block.c @@ -2785,14 +2785,14 @@ static BlockReopenQueue *bdrv_reopen_queue_child(Bl= ockReopenQueue *bs_queue, BlockDriverState *bs, QDict *options, int flags, - const BdrvChildRole *role, + BdrvChild *child, QDict *parent_options, int parent_flags) { assert(bs !=3D NULL); =20 BlockReopenQueueEntry *bs_entry; - BdrvChild *child; + BdrvChild *c; QDict *old_options, *explicit_options; =20 /* Make sure that the caller remembered to use a drained section. This= is @@ -2847,10 +2847,11 @@ static BlockReopenQueue *bdrv_reopen_queue_child(Bl= ockReopenQueue *bs_queue, explicit_options =3D qdict_clone_shallow(options); =20 /* Inherit from parent node */ + assert(!!child =3D=3D !!parent_options); if (parent_options) { - assert(!flags); - role->inherit_options(&flags, options, parent_flags, parent_option= s, - 0); + child->role->inherit_options(&flags, options, + parent_flags, parent_options, + child->bs->open_flags); } =20 /* Old values are used for options that aren't set yet */ @@ -2881,23 +2882,23 @@ static BlockReopenQueue *bdrv_reopen_queue_child(Bl= ockReopenQueue *bs_queue, bs_entry->state.perm =3D UINT64_MAX; bs_entry->state.shared_perm =3D 0; =20 - QLIST_FOREACH(child, &bs->children, next) { + QLIST_FOREACH(c, &bs->children, next) { QDict *new_child_options; char *child_key_dot; =20 /* reopen can only change the options of block devices that were * implicitly created and inherited options. For other (referenced) * block devices, a syntax like "backing.foo" results in an error.= */ - if (child->bs->inherits_from !=3D bs) { + if (c->bs->inherits_from !=3D bs) { continue; } =20 - child_key_dot =3D g_strdup_printf("%s.", child->name); + child_key_dot =3D g_strdup_printf("%s.", c->name); qdict_extract_subqdict(options, &new_child_options, child_key_dot); g_free(child_key_dot); =20 - bdrv_reopen_queue_child(bs_queue, child->bs, new_child_options, 0, - child->role, options, flags); + bdrv_reopen_queue_child(bs_queue, c->bs, new_child_options, 0, + c, options, flags); } =20 return bs_queue; --=20 2.14.3