From nobody Tue Apr 15 04:39:57 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=1589548113; cv=none; d=zohomail.com; s=zohoarc; b=XLdU5w6BeMphAz4E50h4/FGGytC2D67MKRLscWSE3atqw7sujxHien82W1zs6XEWViAJhZq7JKKx0mlUiyfAZRh4t+5fRE3VCvXRfML+5f64IKAeNf3Hz1HhNxDK4IKhWRr48FtGElRZAuHB983D3u+gcUdlyM/+0zlTvtYsY7U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589548113; 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=tg8lpyOV45BMwhihe2Api6pEF6d2b7vaoAExMz/46tI=; b=NGWTaSFEEgUB8dU6NfsldyJrrcbKiXUrDToobVhXpwORbNg6+YgJB5PSxkjYvncSjteqrzOSpiSLHIoYEu4aASXn2ZrwkifBwp+eOUUNU8Rj9vuvscKBsyDDLus7cIUFoEpy4ljOCCKiYhreukLu3Z6/1L1Eibt3ywUnuhVhCXA= 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 1589548113681153.89471672221646; Fri, 15 May 2020 06:08:33 -0700 (PDT) Received: from localhost ([::1]:48442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZa4m-0002jh-FH for importer@patchew.org; Fri, 15 May 2020 09:08:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45840) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZZjM-0003Hc-Nk for qemu-devel@nongnu.org; Fri, 15 May 2020 08:46:24 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:47762 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 1jZZjL-0002Pi-Cp for qemu-devel@nongnu.org; Fri, 15 May 2020 08:46:24 -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-32-5LdJUFrUOfy_ASegCmYzDg-1; Fri, 15 May 2020 08:46:20 -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 46D051005510; Fri, 15 May 2020 12:46:19 +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 4EC422E024; Fri, 15 May 2020 12:46:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589546782; 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=tg8lpyOV45BMwhihe2Api6pEF6d2b7vaoAExMz/46tI=; b=hZyX3lC/zu6fB0/LT/Dce9CGg4qxs4XAtCHAco0B0XrvcZ9ECwJTYrrEQqlxd2q/33DDqu z2JFKsFbQs+4FUJsaAe5NFQpKer26mKQ99FNYTLFbYzey/dw1IQiAmD3hKfrEBBg/KBhla YDNl4fOUHYrrUX3CfJHAG9T89ZgN4os= X-MC-Unique: 5LdJUFrUOfy_ASegCmYzDg-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 34/51] block: Drop child_format Date: Fri, 15 May 2020 14:45:04 +0200 Message-Id: <20200515124521.335403-35-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 Reviewed-by: Eric Blake Message-Id: <20200513110544.176672-23-mreitz@redhat.com> Signed-off-by: Kevin Wolf --- include/block/block_int.h | 1 - block.c | 29 ----------------------------- 2 files changed, 30 deletions(-) diff --git a/include/block/block_int.h b/include/block/block_int.h index 3a9dda9be7..4b09fa1124 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_format; extern const BdrvChildClass child_backing; =20 struct BdrvChild { diff --git a/block.c b/block.c index 088727fdbe..85b4f947ba 100644 --- a/block.c +++ b/block.c @@ -1172,35 +1172,6 @@ const BdrvChildClass child_file =3D { .set_aio_ctx =3D bdrv_child_cb_set_aio_ctx, }; =20 -/* - * Returns the options and flags that bs->file should get if the use of fo= rmats - * (and not only protocols) is permitted for it, based on the given option= s and - * 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) -{ - bdrv_inherited_options(BDRV_CHILD_DATA, false, - child_flags, child_options, - parent_flags, parent_options); -} - -const BdrvChildClass child_format =3D { - .parent_is_bds =3D true, - .get_parent_desc =3D bdrv_child_get_parent_desc, - .inherit_options =3D bdrv_inherited_fmt_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, - .attach =3D bdrv_child_cb_attach, - .detach =3D bdrv_child_cb_detach, - .inactivate =3D bdrv_child_cb_inactivate, - .can_set_aio_ctx =3D bdrv_child_cb_can_set_aio_ctx, - .set_aio_ctx =3D bdrv_child_cb_set_aio_ctx, -}; - static void bdrv_backing_attach(BdrvChild *c) { BlockDriverState *parent =3D c->opaque; --=20 2.25.4