From nobody Mon Feb 9 20:35:09 2026 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1574861943; cv=none; d=zohomail.com; s=zohoarc; b=QsZXOd6b0ec7qq0vEqAfMWh2XAdSqxiFtPNsPJSHNv7T8oB20jhPXLHjmd2rKUTxbFJFSAbef+Bo5K/Ybv0XYU3fo8a4T4a8mQkZBBtkKA6cX+/5v1MRkunwcCjc0qZTT4a7aXoLphTcQgG0l1Sk1rLRp+fP4Fe8G/LE6A345W8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574861943; 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=/tmzmX+bU02MDLQpcCuZgV2EXKtowiks6KcPG5gw1FQ=; b=Xwxi3EUpsujIFymL/NVKhttCuWdJ46zcTQ56zSfLV7GR4jw03QaauXc+gKFkOh/cFyhkpvjR2UiYoCHOV2o0JWyatsmB0CTBj8vu/kZT3CrnZ5PomidvN5Q2nn5gzqoRoY7R7moWwcEOHEsfBV/lKsa96lmbDBLDq48FD5kifgs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1574861943250784.4295563597541; Wed, 27 Nov 2019 05:39:03 -0800 (PST) Received: from localhost ([::1]:38438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZxX3-0006Ve-J2 for importer@patchew.org; Wed, 27 Nov 2019 08:39:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33989) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZxC8-0004H7-4V for qemu-devel@nongnu.org; Wed, 27 Nov 2019 08:17:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZxC6-0006zJ-Re for qemu-devel@nongnu.org; Wed, 27 Nov 2019 08:17:24 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:27986 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iZxC6-0006xW-Mf for qemu-devel@nongnu.org; Wed, 27 Nov 2019 08:17:22 -0500 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-338-GqMHS3_UOiWQyCvKT5Hbqw-1; Wed, 27 Nov 2019 08:17:18 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AC6B48017DD; Wed, 27 Nov 2019 13:17:17 +0000 (UTC) Received: from localhost (ovpn-205-186.brq.redhat.com [10.40.205.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 465F65C219; Wed, 27 Nov 2019 13:17:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574860640; 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=/tmzmX+bU02MDLQpcCuZgV2EXKtowiks6KcPG5gw1FQ=; b=Yaivm0DM2flH0ReVOfqSRExRqABqHduj5DTjS+ob4n+GgrEbNfRA/N4Xm6a57sRUD4Lc2w 0TUlCFRXvH8wGowGrHns+Z79QDyq5e1ybWRWwbEZcnTLliXgphuD0PuaybPqzeN6IERY2j YpurB8tYC73+Eloemq01UiF6tyCiEb0= From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH for-5.0 21/31] block: Drop child_backing Date: Wed, 27 Nov 2019 14:16:14 +0100 Message-Id: <20191127131624.1062403-22-mreitz@redhat.com> In-Reply-To: <20191127131624.1062403-1-mreitz@redhat.com> References: <20191127131624.1062403-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: GqMHS3_UOiWQyCvKT5Hbqw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz --- block.c | 62 +++------------------------------------ include/block/block_int.h | 1 - 2 files changed, 4 insertions(+), 59 deletions(-) diff --git a/block.c b/block.c index 63fe19fd73..0530c81c6d 100644 --- a/block.c +++ b/block.c @@ -1147,15 +1147,6 @@ static void bdrv_backing_attach(BdrvChild *c) parent->backing_blocker); } =20 -/* XXX: Will be removed along with child_backing */ -static void bdrv_child_cb_attach_backing(BdrvChild *c) -{ - if (!(c->role & BDRV_CHILD_COW)) { - bdrv_backing_attach(c); - } - bdrv_child_cb_attach(c); -} - static void bdrv_backing_detach(BdrvChild *c) { BlockDriverState *parent =3D c->opaque; @@ -1166,28 +1157,6 @@ static void bdrv_backing_detach(BdrvChild *c) parent->backing_blocker =3D NULL; } =20 -/* XXX: Will be removed along with child_backing */ -static void bdrv_child_cb_detach_backing(BdrvChild *c) -{ - if (!(c->role & BDRV_CHILD_COW)) { - bdrv_backing_detach(c); - } - bdrv_child_cb_detach(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, - int *child_flags, QDict *child_options, - int parent_flags, QDict *parent_options) -{ - bdrv_inherited_options(BDRV_CHILD_COW, - child_flags, child_options, - parent_flags, parent_options); -} - static int bdrv_backing_update_filename(BdrvChild *c, BlockDriverState *ba= se, const char *filename, Error **errp) { @@ -1215,21 +1184,6 @@ static int bdrv_backing_update_filename(BdrvChild *c= , BlockDriverState *base, return ret; } =20 -const BdrvChildClass child_backing =3D { - .parent_is_bds =3D true, - .get_parent_desc =3D bdrv_child_get_parent_desc, - .attach =3D bdrv_child_cb_attach_backing, - .detach =3D bdrv_child_cb_detach_backing, - .inherit_options =3D bdrv_backing_options, - .drained_begin =3D bdrv_child_cb_drained_begin, - .drained_poll =3D bdrv_child_cb_drained_poll, - .drained_end =3D bdrv_child_cb_drained_end, - .inactivate =3D bdrv_child_cb_inactivate, - .update_filename =3D bdrv_backing_update_filename, - .can_set_aio_ctx =3D bdrv_child_cb_can_set_aio_ctx, - .set_aio_ctx =3D bdrv_child_cb_set_aio_ctx, -}; - static int bdrv_open_flags(BlockDriverState *bs, int flags) { int open_flags =3D flags; @@ -2235,8 +2189,7 @@ static void bdrv_default_perms_for_backing(BlockDrive= rState *bs, BdrvChild *c, uint64_t perm, uint64_t shared, uint64_t *nperm, uint64_t *nsha= red) { - assert(child_class =3D=3D &child_backing || - (child_class =3D=3D &child_of_bds && (role & BDRV_CHILD_COW))); + assert(child_class =3D=3D &child_of_bds && (role & BDRV_CHILD_COW)); =20 /* * We want consistent read from backing files if the parent needs it. @@ -2348,23 +2301,16 @@ void bdrv_format_default_perms(BlockDriverState *bs= , BdrvChild *c, uint64_t perm, uint64_t shared, uint64_t *nperm, uint64_t *nshared) { - bool backing =3D (child_class =3D=3D &child_backing); - if (child_class =3D=3D &child_of_bds) { bdrv_default_perms(bs, c, child_class, role, reopen_queue, perm, shared, nperm, nshared); return; } =20 - assert(child_class =3D=3D &child_backing || child_class =3D=3D &child_= file); + assert(child_class =3D=3D &child_file); =20 - if (!backing) { - bdrv_default_perms_for_metadata(bs, c, child_class, role, reopen_q= ueue, - perm, shared, nperm, nshared); - } else { - bdrv_default_perms_for_backing(bs, c, child_class, role, reopen_qu= eue, - perm, shared, nperm, nshared); - } + bdrv_default_perms_for_metadata(bs, c, child_class, role, reopen_queue, + perm, shared, nperm, nshared); } =20 void bdrv_default_perms(BlockDriverState *bs, BdrvChild *c, diff --git a/include/block/block_int.h b/include/block/block_int.h index fe6206b210..895bcf4d30 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -731,7 +731,6 @@ struct BdrvChildClass { =20 extern const BdrvChildClass child_of_bds; extern const BdrvChildClass child_file; -extern const BdrvChildClass child_backing; =20 struct BdrvChild { BlockDriverState *bs; --=20 2.23.0