From nobody Sat Apr 26 17:26:46 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1589547920; cv=none;
d=zohomail.com; s=zohoarc;
b=lofWmcDzaufQrtU7JBLVpVcf9/vKLXBAdhw4rN8dKModG/KpsamhEe45CY6oN+JVngSjOv0WN6wXKRltZuh4+pyM3tNf/t5GlwnE0gRKKzIL6UPptRyYNTkMHJQ33MCDeiIo0GscNpCOj4p4hJB521j4xj6hnMqYALXGXGX96pA=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1589547920;
h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
bh=kZuazOMUwRLLzk5qHTUyroYUdMh+epEeiUtdPFvTmns=;
b=KdOT/vTqe0+5IbTSTOsRqOrdEg+e7N7yTes8AN2URhTuhC72xIBySjreReNIp1GCAmHfu837O/2uwwoMFdC3g7h1+40IfAw2hZ+NUWShuoAzMzfSJUxMLd4+9c67L6JyYM2JGjRo2st4NLTmdzozzcojNcbj6EArGklfPfWXcRA=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<kwolf@redhat.com> (p=none dis=none)
header.from=<kwolf@redhat.com>
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1589547920933133.5502236787396;
Fri, 15 May 2020 06:05:20 -0700 (PDT)
Received: from localhost ([::1]:34086 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1jZa1g-0005CW-4B
for importer@patchew.org; Fri, 15 May 2020 09:05:20 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:45664)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <kwolf@redhat.com>) id 1jZZj8-0002jN-5Y
for qemu-devel@nongnu.org; Fri, 15 May 2020 08:46:10 -0400
Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:46919
helo=us-smtp-1.mimecast.com)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256)
(Exim 4.90_1) (envelope-from <kwolf@redhat.com>) id 1jZZj5-0002IP-Ha
for qemu-devel@nongnu.org; Fri, 15 May 2020 08:46:09 -0400
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
[209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
us-mta-425-5dvDr0AQMH2nLzQ4XhG53g-1; Fri, 15 May 2020 08:46:02 -0400
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com
[10.5.11.23])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7196DA0BD7;
Fri, 15 May 2020 12:46:01 +0000 (UTC)
Received: from linux.fritz.box.com (ovpn-113-110.ams2.redhat.com
[10.36.113.110])
by smtp.corp.redhat.com (Postfix) with ESMTP id 734C62E170;
Fri, 15 May 2020 12:46:00 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1589546765;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=kZuazOMUwRLLzk5qHTUyroYUdMh+epEeiUtdPFvTmns=;
b=RqaxBLi5DHGZabnjb2CbiR3fZuupE30UuNxQeQJmv2YkLYdxsVEZ20V1wgtYj/fLFGfDpC
gDf8Yztu9GlOqtX8Qk9lnRHKLFBui7THvzXDZIExPEs4MyO6OsjYMJqu7LcPHmWLgnHQjD
rwxfPZXzJ+r7bQZK06BW6LQ/sxjnALc=
X-MC-Unique: 5dvDr0AQMH2nLzQ4XhG53g-1
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Subject: [PULL 20/51] block: Pass parent_is_format to .inherit_options()
Date: Fri, 15 May 2020 14:44:50 +0200
Message-Id: <20200515124521.335403-21-kwolf@redhat.com>
In-Reply-To: <20200515124521.335403-1-kwolf@redhat.com>
References: <20200515124521.335403-1-kwolf@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=207.211.31.120; envelope-from=kwolf@redhat.com;
helo=us-smtp-1.mimecast.com
X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/14 22:56:02
X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy]
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001,
DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001,
SPF_PASS=-0.001 autolearn=_AUTOLEARN
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: pass (identity @redhat.com)
Content-Type: text/plain; charset="utf-8"
From: Max Reitz <mreitz@redhat.com>
We plan to unify the generic .inherit_options() functions. The
resulting common function will need to decide whether to force-enable
format probing, force-disable it, or leave it as-is. To make this
decision, it will need to know whether the parent node is a format node
or not (because we never want format probing if the parent is a format
node already (except for the backing chain)).
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200513110544.176672-9-mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
include/block/block_int.h | 2 +-
block.c | 37 +++++++++++++++++++++++++++----------
block/block-backend.c | 2 +-
block/vvfat.c | 2 +-
4 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 8c1160a577..6245d8a18d 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -677,7 +677,7 @@ struct BdrvChildClass {
* non-BDS parents. */
bool parent_is_bds;
=20
- void (*inherit_options)(BdrvChildRole role,
+ void (*inherit_options)(BdrvChildRole role, bool parent_is_format,
int *child_flags, QDict *child_options,
int parent_flags, QDict *parent_options);
=20
diff --git a/block.c b/block.c
index 40db0b78b9..b78e2dc141 100644
--- a/block.c
+++ b/block.c
@@ -1154,7 +1154,7 @@ static void bdrv_temp_snapshot_options(int *child_fla=
gs, QDict *child_options,
* Returns the options and flags that bs->file should get if a protocol dr=
iver
* is expected, based on the given options and flags for the parent BDS
*/
-static void bdrv_inherited_options(BdrvChildRole role,
+static void bdrv_inherited_options(BdrvChildRole role, bool parent_is_form=
at,
int *child_flags, QDict *child_options,
int parent_flags, QDict *parent_options)
{
@@ -1205,10 +1205,12 @@ const BdrvChildClass child_file =3D {
* flags for the parent BDS
*/
static void bdrv_inherited_fmt_options(BdrvChildRole role,
+ bool parent_is_format,
int *child_flags, QDict *child_opti=
ons,
int parent_flags, QDict *parent_opt=
ions)
{
- child_file.inherit_options(role, child_flags, child_options,
+ child_file.inherit_options(role, parent_is_format,
+ child_flags, child_options,
parent_flags, parent_options);
=20
*child_flags &=3D ~(BDRV_O_PROTOCOL | BDRV_O_NO_IO);
@@ -1289,7 +1291,7 @@ static void bdrv_backing_detach(BdrvChild *c)
* Returns the options and flags that bs->backing should get, based on the
* given options and flags for the parent BDS
*/
-static void bdrv_backing_options(BdrvChildRole role,
+static void bdrv_backing_options(BdrvChildRole role, bool parent_is_format,
int *child_flags, QDict *child_options,
int parent_flags, QDict *parent_options)
{
@@ -3173,8 +3175,22 @@ static BlockDriverState *bdrv_open_inherit(const cha=
r *filename,
bs->explicit_options =3D qdict_clone_shallow(options);
=20
if (child_class) {
+ bool parent_is_format;
+
+ if (parent->drv) {
+ parent_is_format =3D parent->drv->is_format;
+ } else {
+ /*
+ * parent->drv is not set yet because this node is opened for
+ * (potential) format probing. That means that @parent is goi=
ng
+ * to be a format node.
+ */
+ parent_is_format =3D true;
+ }
+
bs->inherits_from =3D parent;
- child_class->inherit_options(child_role, &flags, options,
+ child_class->inherit_options(child_role, parent_is_format,
+ &flags, options,
parent->open_flags, parent->options);
}
=20
@@ -3203,7 +3219,7 @@ static BlockDriverState *bdrv_open_inherit(const char=
*filename,
flags, options);
/* Let bdrv_backing_options() override "read-only" */
qdict_del(options, BDRV_OPT_READ_ONLY);
- bdrv_backing_options(0, &flags, options, flags, options);
+ bdrv_backing_options(0, true, &flags, options, flags, options);
}
=20
bs->open_flags =3D flags;
@@ -3488,6 +3504,7 @@ static BlockReopenQueue *bdrv_reopen_queue_child(Bloc=
kReopenQueue *bs_queue,
QDict *options,
const BdrvChildClass *kla=
ss,
BdrvChildRole role,
+ bool parent_is_format,
QDict *parent_options,
int parent_flags,
bool keep_old_opts)
@@ -3543,7 +3560,7 @@ static BlockReopenQueue *bdrv_reopen_queue_child(Bloc=
kReopenQueue *bs_queue,
/* Inherit from parent node */
if (parent_options) {
flags =3D 0;
- klass->inherit_options(role, &flags, options,
+ klass->inherit_options(role, parent_is_format, &flags, options,
parent_flags, parent_options);
} else {
flags =3D bdrv_get_flags(bs);
@@ -3635,8 +3652,8 @@ static BlockReopenQueue *bdrv_reopen_queue_child(Bloc=
kReopenQueue *bs_queue,
}
=20
bdrv_reopen_queue_child(bs_queue, child->bs, new_child_options,
- child->klass, child->role, options, flags,
- child_keep_old);
+ child->klass, child->role, bs->drv->is_for=
mat,
+ options, flags, child_keep_old);
}
=20
return bs_queue;
@@ -3646,8 +3663,8 @@ BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue =
*bs_queue,
BlockDriverState *bs,
QDict *options, bool keep_old_opts)
{
- return bdrv_reopen_queue_child(bs_queue, bs, options, NULL, 0, NULL, 0,
- keep_old_opts);
+ return bdrv_reopen_queue_child(bs_queue, bs, options, NULL, 0, false,
+ NULL, 0, keep_old_opts);
}
=20
/*
diff --git a/block/block-backend.c b/block/block-backend.c
index 5539ca8816..f2e81af27d 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -120,7 +120,7 @@ static QTAILQ_HEAD(, BlockBackend) block_backends =3D
static QTAILQ_HEAD(, BlockBackend) monitor_block_backends =3D
QTAILQ_HEAD_INITIALIZER(monitor_block_backends);
=20
-static void blk_root_inherit_options(BdrvChildRole role,
+static void blk_root_inherit_options(BdrvChildRole role, bool parent_is_fo=
rmat,
int *child_flags, QDict *child_option=
s,
int parent_flags, QDict *parent_optio=
ns)
{
diff --git a/block/vvfat.c b/block/vvfat.c
index 4033e4f369..b4c8417dbd 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -3128,7 +3128,7 @@ static BlockDriver vvfat_write_target =3D {
.bdrv_co_pwritev =3D write_target_commit,
};
=20
-static void vvfat_qcow_options(BdrvChildRole role,
+static void vvfat_qcow_options(BdrvChildRole role, bool parent_is_format,
int *child_flags, QDict *child_options,
int parent_flags, QDict *parent_options)
{
--=20
2.25.4