From nobody Tue Apr 15 04:23:56 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=1589548328; cv=none; d=zohomail.com; s=zohoarc; b=KivxTtBFpIj85FC98yh18kI4B7f4JuIn28bAwr/xiGmKRHjaKkvmL9nS3EjSR2bAbbC9yRvKRUFu/uqPauDRSaCb0UU5jV4gFJC5W0HkIy+15yI8asLXedxV5r+Z7IiP7zFJysPYJJqCM5CQ1eAkKVVZC66rNJBHFSbPYqQvFsA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589548328; 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=WO1RmzvUGN7QwMZ7IB3cZAT2Hj4r6SJ5n0/HFJEnUmk=; b=HWD4w1TAIISIj0MKBMFMVS6wGRnXVtlTAOcoONgaNODvjb+R4BM+2MFpXlo0Figue7NC7Pz+jioT4xSHmjOc0HejCSjpFmEmanqTEuc+9cknPyoeJImLmIzoXClFV9DOh2F8vnuyW8l/p/efEROjTYdDj3KwAqR714RU1VkEQ6I= 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= (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 1589548328182661.5421852094278; Fri, 15 May 2020 06:12:08 -0700 (PDT) Received: from localhost ([::1]:35508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZa8F-00012A-Aj for importer@patchew.org; Fri, 15 May 2020 09:12:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZZjR-0003UE-HS for qemu-devel@nongnu.org; Fri, 15 May 2020 08:46:29 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:22192 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 ) id 1jZZjP-0002R0-Fn for qemu-devel@nongnu.org; Fri, 15 May 2020 08:46:29 -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-12-YVdfH5uNPgCr0TYvt1k2qg-1; Fri, 15 May 2020 08:46:22 -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 D2408835B5E; Fri, 15 May 2020 12:46:21 +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 D70422E024; Fri, 15 May 2020 12:46:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589546786; 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=WO1RmzvUGN7QwMZ7IB3cZAT2Hj4r6SJ5n0/HFJEnUmk=; b=OyH/YsYQEB9epxlNbybcqf2nGXfzG0VmqfexQ8H0vspAhjv3irB1oMl9j3UcxhuInMJaxP tacxPMsD7FUFESrQa0ldMwqneJElWhKNkYFPZc4GAi5lcpFmcHuxy1/v0XXNXxHSreZw4T 3+huvI2Ab9/FlAl0e2pctrVAeb8aYl4= X-MC-Unique: YVdfH5uNPgCr0TYvt1k2qg-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 36/51] block: Drop child_backing Date: Fri, 15 May 2020 14:45:06 +0200 Message-Id: <20200515124521.335403-37-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=205.139.110.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 23:27:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Max Reitz Signed-off-by: Max Reitz Message-Id: <20200513110544.176672-25-mreitz@redhat.com> Reviewed-by: Eric Blake Signed-off-by: Kevin Wolf --- include/block/block_int.h | 1 - block.c | 60 ++------------------------------------- 2 files changed, 3 insertions(+), 58 deletions(-) diff --git a/include/block/block_int.h b/include/block/block_int.h index 4b09fa1124..0781d43af5 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -742,7 +742,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; diff --git a/block.c b/block.c index 131ae20ffc..d138a3c261 100644 --- a/block.c +++ b/block.c @@ -1215,15 +1215,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; @@ -1234,28 +1225,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, bool parent_is_format, - int *child_flags, QDict *child_options, - int parent_flags, QDict *parent_options) -{ - bdrv_inherited_options(BDRV_CHILD_COW, true, - child_flags, child_options, - parent_flags, parent_options); -} - static int bdrv_backing_update_filename(BdrvChild *c, BlockDriverState *ba= se, const char *filename, Error **errp) { @@ -1283,21 +1252,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, -}; - /* * Returns the options and flags that a generic child of a BDS should * get, based on the given options and flags for the parent BDS. @@ -2446,8 +2400,7 @@ static void bdrv_default_perms_for_cow(BlockDriverSta= te *bs, BdrvChild *c, uint64_t perm, uint64_t shared, uint64_t *nperm, uint64_t *nshared) { - 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. @@ -2566,23 +2519,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_storage(bs, c, child_class, role, reopen_qu= eue, - perm, shared, nperm, nshared); - } else { - bdrv_default_perms_for_cow(bs, c, child_class, role, reopen_queue, + bdrv_default_perms_for_storage(bs, c, child_class, role, reopen_queue, perm, shared, nperm, nshared); - } } =20 void bdrv_default_perms(BlockDriverState *bs, BdrvChild *c, --=20 2.25.4