From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E523C35247 for ; Tue, 4 Feb 2020 17:30:16 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5A0F32082E for ; Tue, 4 Feb 2020 17:30:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="blRKSxjR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5A0F32082E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iz21f-0002LC-Gs for qemu-devel@archiver.kernel.org; Tue, 04 Feb 2020 12:30:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54503) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iz1jC-0006BF-UC for qemu-devel@nongnu.org; Tue, 04 Feb 2020 12:11:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iz1jB-000842-4X for qemu-devel@nongnu.org; Tue, 04 Feb 2020 12:11:10 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:21288 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 1iz1jB-00080o-0S for qemu-devel@nongnu.org; Tue, 04 Feb 2020 12:11:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580836268; 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=qoGeCQ2KSovzZIUqYxFZh5chDsMJdaoqhoLDij2PHrM=; b=blRKSxjRZ6i+qy381okwCsUv2nqsa7fcHrq9f32chPpw6iuzd3XaVej0Go5azljjdaXePK uSBsL8AmIuqFT6kZCO4qpnxdl+hU3YOXgvQabg3pNAfrI4dr42bE4OYqznZRMgacoZH/Uj CnLXPLIXmry0ilEW4guP4byOCQJrDeQ= 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-426-w6D8pG6lMhCEaazN7nXOtw-1; Tue, 04 Feb 2020 12:09:24 -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 A0CAF8010E6; Tue, 4 Feb 2020 17:09:23 +0000 (UTC) Received: from localhost (ovpn-117-98.ams2.redhat.com [10.36.117.98]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 38FFA5C54A; Tue, 4 Feb 2020 17:09:23 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH v2 11/33] block: Unify bdrv_child_cb_attach() Date: Tue, 4 Feb 2020 18:08:26 +0100 Message-Id: <20200204170848.614480-12-mreitz@redhat.com> In-Reply-To: <20200204170848.614480-1-mreitz@redhat.com> References: <20200204170848.614480-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: w6D8pG6lMhCEaazN7nXOtw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII 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: 207.211.31.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 , Vladimir Sementsov-Ogievskiy , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Make bdrv_child_cb_attach() call bdrv_backing_attach() for children with a COW role (and drop the reverse call from bdrv_backing_attach()), so it can be used for any child (with a proper role set). Because so far no child has a proper role set, we need a temporary new callback for child_backing.attach that ensures bdrv_backing_attach() is called for all COW children that do not have their role set yet. Signed-off-by: Max Reitz --- block.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index 74abdd9a5d..4af81547f3 100644 --- a/block.c +++ b/block.c @@ -920,9 +920,16 @@ static void bdrv_child_cb_drained_end(BdrvChild *child= , bdrv_drained_end_no_poll(bs, drained_end_counter); } =20 +static void bdrv_backing_attach(BdrvChild *c); + static void bdrv_child_cb_attach(BdrvChild *child) { BlockDriverState *bs =3D child->opaque; + + if (child->role & BDRV_CHILD_COW) { + bdrv_backing_attach(child); + } + bdrv_apply_subtree_drain(child, bs); } =20 @@ -1156,7 +1163,14 @@ static void bdrv_backing_attach(BdrvChild *c) parent->backing_blocker); bdrv_op_unblock(backing_hd, BLOCK_OP_TYPE_BACKUP_TARGET, 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); } =20 @@ -1215,7 +1229,7 @@ static int bdrv_backing_update_filename(BdrvChild *c,= BlockDriverState *base, const BdrvChildClass child_backing =3D { .parent_is_bds =3D true, .get_parent_desc =3D bdrv_child_get_parent_desc, - .attach =3D bdrv_backing_attach, + .attach =3D bdrv_child_cb_attach_backing, .detach =3D bdrv_backing_detach, .inherit_options =3D bdrv_backing_options, .drained_begin =3D bdrv_child_cb_drained_begin, --=20 2.24.1