From nobody Thu Jan 23 05:56:30 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=1737546797; cv=none; d=zohomail.com; s=zohoarc; b=aptCpb7NM2OZ46gmOHmQykAUL+YfBsoJsBOdpE/jJw7Z/xTwBVmNFEwsKevDR9qMWGbwjkxUZhvpGNuhBjVcINq90Dp+8E+YF7lYwzor82mfrKXhLx60NsIKWIN5RcADWOvDBUlMhEqHieafR8kdu9Zawdzol4rTQFKyrw1R3j8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1737546797; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7Vbz0z3fzrn6gURjwRoRl18BXwv5/wFg+/5uraPQpsU=; b=LAWy57uLUEsiP2pPESdWndBYDJ4IBxso8D46s57QVacTH96aQUpGrIYG6SJOnmelFBUGx105T3fjNx9RflQKp7mUWWhb82Q8Ltj7FXPO7BlwvZiWCrNOenml0CFjdEpiCW8UwHYJbCRl/+8HrHlI9Un3pv6/oLcFEw6MbUTPzok= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1737546797050420.7937717129961; Wed, 22 Jan 2025 03:53:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1taZGg-0002aL-AN; Wed, 22 Jan 2025 06:51:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1taZGd-0002Yh-Uk for qemu-devel@nongnu.org; Wed, 22 Jan 2025 06:51:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1taZGb-00087S-GM for qemu-devel@nongnu.org; Wed, 22 Jan 2025 06:51:31 -0500 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-126-DALymUO7PAyZzwCabyjLgg-1; Wed, 22 Jan 2025 06:51:24 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EA7D61956050; Wed, 22 Jan 2025 11:51:23 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.39.193.195]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 42C5719560AA; Wed, 22 Jan 2025 11:51:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1737546687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7Vbz0z3fzrn6gURjwRoRl18BXwv5/wFg+/5uraPQpsU=; b=V47iCg90qzLcPcbeANIQfG/ftXhPI1S2kl0CeulkaIpU8ZDBB+NmPkv9GJXvrG5CSRL6p+ pyJ1Et8i13MmXU+MUsjmcqJJND9R5hlY4rS2b8af6rq0wLfEeqln+q28lgh1/p+8U9YzkY u984QKTc8trXH61w/LmgocVF1P7yO6A= X-MC-Unique: DALymUO7PAyZzwCabyjLgg-1 X-Mimecast-MFC-AGG-ID: DALymUO7PAyZzwCabyjLgg From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, pkrempa@redhat.com, peterx@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 3/9] block: Support inactive nodes in blk_insert_bs() Date: Wed, 22 Jan 2025 12:50:40 +0100 Message-ID: <20250122115046.51216-4-kwolf@redhat.com> In-Reply-To: <20250122115046.51216-1-kwolf@redhat.com> References: <20250122115046.51216-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 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=170.10.133.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -51 X-Spam_score: -5.2 X-Spam_bar: ----- X-Spam_report: (-5.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.996, 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.086, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1737546797569019000 Content-Type: text/plain; charset="utf-8" Device models have a relatively complex way to set up their block backends, in which blk_attach_dev() sets blk->disable_perm =3D true. We want to support inactive images in exports, too, so that qemu-storage-daemon can be used with migration. Because they don't use blk_attach_dev(), they need another way to set this flag. The most convenient is to do this automatically when an inactive node is attached to a BlockBackend. Signed-off-by: Kevin Wolf --- block/block-backend.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/block/block-backend.c b/block/block-backend.c index b610582644..76ec5f0576 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -900,14 +900,24 @@ void blk_remove_bs(BlockBackend *blk) int blk_insert_bs(BlockBackend *blk, BlockDriverState *bs, Error **errp) { ThrottleGroupMember *tgm =3D &blk->public.throttle_group_member; + uint64_t perm, shared_perm; =20 GLOBAL_STATE_CODE(); bdrv_ref(bs); bdrv_graph_wrlock(); + + if (bs->open_flags & BDRV_O_INACTIVE) { + blk->disable_perm =3D true; + perm =3D 0; + shared_perm =3D BLK_PERM_ALL; + } else { + perm =3D blk->perm; + shared_perm =3D blk->shared_perm; + } + blk->root =3D bdrv_root_attach_child(bs, "root", &child_root, BDRV_CHILD_FILTERED | BDRV_CHILD_PR= IMARY, - blk->perm, blk->shared_perm, - blk, errp); + perm, shared_perm, blk, errp); bdrv_graph_wrunlock(); if (blk->root =3D=3D NULL) { return -EPERM; --=20 2.48.1