From nobody Fri May 3 20:05:43 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1622534230; cv=pass; d=zohomail.com; s=zohoarc; b=dVGCgOjwowYRID6GEqGWeAM0dqHHvI0CRfHyzSUtzHIrsYw9ieOV5JZqkbFIjRGngx1eNj9ibMekEi0sjaaqnaFvXXqy/iIfNWthVZGeC1QGa+IcX2FDtBB/TMwhMLpvS4L/Ug/iLaIoeiKYRemMYlfaK7f664hOKcIqhMHTMm8= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622534230; 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=lI4hsxBjsWD5ITo5g5aEy17UMxJb7LFGHn73bBiEXQE=; b=hIdxLI67Z4GbS+bk9opp8g9Tn7wnAm2Gm7+xiOYBiowVaCzdIAuh06urf/2nRokimDeeYWPAZRDIYgz+Ba0AlvEdrhf4O1KbJSIPIz4ZQg1vUZfo5x+zSlRrVBBF9jyCxG9ukQyyU5BrdKey05MIpHltfuxtS6C8jdSOOTqiSFA= ARC-Authentication-Results: i=2; 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+importer2=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine 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 1622534230442903.2883319094608; Tue, 1 Jun 2021 00:57:10 -0700 (PDT) Received: from localhost ([::1]:39154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnzGv-0006zP-BG for importer2@patchew.org; Tue, 01 Jun 2021 03:57:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnzCh-0001Zy-2N; Tue, 01 Jun 2021 03:52:47 -0400 Received: from mail-eopbgr140133.outbound.protection.outlook.com ([40.107.14.133]:29384 helo=EUR01-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnzCc-0005x4-3W; Tue, 01 Jun 2021 03:52:46 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB2099.eurprd08.prod.outlook.com (2603:10a6:203:4d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.24; Tue, 1 Jun 2021 07:52:36 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%7]) with mapi id 15.20.4173.030; Tue, 1 Jun 2021 07:52:36 +0000 Received: from localhost.localdomain (185.215.60.210) by HE1PR0802CA0018.eurprd08.prod.outlook.com (2603:10a6:3:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20 via Frontend Transport; Tue, 1 Jun 2021 07:52:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TxqTzez6ypIJgbiedrVLQK+ojYwWpr3O77q4xJXy0ss1ajlUg3RYvI1JiQ2lROwpk+wMaL3G76hLIOUxBB+yMz50ePRfmEsKCm1rBVUDLdGoPThDJjeYaYoHoo9uc/xbFRg3yzqj7Ooz2RXdEcQWVmfHoYQX/vmBRDVz2PvKxOaZ1QHZs1AJNnBk1NuWXudLpL+G15fUj0prum+03eU/zxtSgWMigyvnD6w04B3SRyO+5RjnVaH65ItmCiYU6wCO8ehTgCyLWUyrApq5vzMtrGiCNgRDczMgN2MIvyia2F2tOS+kjj/MEBGWjGqgk6N+sQaIx4yyx4xEE7D4zxTZEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lI4hsxBjsWD5ITo5g5aEy17UMxJb7LFGHn73bBiEXQE=; b=iLLXJcpFjNXF3WgDgUKqCESg39L4b4nR4Krvu+GlOKCQheaM+Ki8yt1IiPI8t6ziMqmM5rExKWflYhZ7sPfZ64r7Gg78qcgDjF71BAPpA+/uC75iUuyx/kPyzzq4grnsA5MTRIe4EDGhfcYT09zeYsw/YHMlxInYvdj0wPEiXfPs/I0ccWEdPWcHtWK/I4HRwwez3dYfbmp5i6jLqTblfyzH/2t7L5ZEk9zE1uoAWCB6zWexm3jknrsZuDyeyYi4oDELZ10OUYPBo+4CitNlyYGZuwC7ldFNPNeF1tiWph2B6aoO3xicUQAlTxyMJAb//S53qG4kLKjjkni1lyTjMw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lI4hsxBjsWD5ITo5g5aEy17UMxJb7LFGHn73bBiEXQE=; b=ODBsvlDNOy3sESnfIZLtOUc/bOXxUoLwxTCKkflJvYiSY0VLLcvFCHTnk+q4kRaovKtwMBupwMzS02HZvFR3ZazmoORnJKiHcOp5wBmJ+zBF4u8FdztvO5lP/mjisbXbwMU/q3U5xap7rnPWFhwHLhfgAcF8D6NKLN/FRHlS2rk= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, mreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com Subject: [PATCH v3 1/6] block: document child argument of bdrv_attach_child_common() Date: Tue, 1 Jun 2021 10:52:13 +0300 Message-Id: <20210601075218.79249-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210601075218.79249-1-vsementsov@virtuozzo.com> References: <20210601075218.79249-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.210] X-ClientProxiedBy: HE1PR0802CA0018.eurprd08.prod.outlook.com (2603:10a6:3:bd::28) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e0d13918-5a05-487b-1888-08d924d23859 X-MS-TrafficTypeDiagnostic: AM5PR0801MB2099: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pZD8L/zcSNraUfNkU2Qfi+ujeF5aa0NrAPkntHO9iY5T1wLPZhgcnB0xBaXfi9E7KvXHOmbJFQxpVi5JsO6wDCKquxaWEe4CjGEWaIZzw8qk+Rt5UVNLl7tVj5CsAxz01Mo3exBLImFWKD8yzcLtovXvdfwwz3QMUeQJdwQmB4sZUGZonJ/vOP7MrfWDJvIwu5xG/BcYterKUyxxPFM5hvxrk9pPEyvXozVdo55jzmMIhDCvXP1u8HLyUN5YEGbpwnA+6RmpsgEvSx+PSJT2jpVbPk751FbdT+FmIsRuCERTHQ2fRqmsy/fBtq4HuDKaCXckkLkCI6M8rrQkN0/P5Jcy3FoFg5+6SOCtv0pXZ6rOxBLhusJuq1pGm6vZwU8jYL5EXg6Q1aDxD7Y4RTyLmZ8d1yDGOvXpJKkJCi2zTOz1MCvhVVmtyAsC8eqBoQ9HRHSBnafURj/O+RANTgqWwsKK2sLK4SfRu4K5dUXOidcXcO8yjf26hEFjbbHv2ghHiBCcPr6KMbpg356KPZbbC/TRi+CDHE24Hz5/AmeKRElLNhsGV889aBP5xVZU2X9V1jkRbXUxaA6bQfTzWEYpJpQtukMftPPzVbXdVWW2vvfBTniBMHc7tFsjoyVURd0Ta40w+tvlEqDt4W1Hyu3MF5tjY9I9jzcCxoMMo8xTnMXUe80+iGbPPYYNTgXwQLy/ X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(376002)(346002)(136003)(39840400004)(396003)(2616005)(6512007)(8676002)(8936002)(2906002)(956004)(36756003)(4326008)(316002)(83380400001)(6506007)(86362001)(107886003)(16526019)(66476007)(66556008)(38350700002)(38100700002)(6916009)(478600001)(6666004)(1076003)(186003)(6486002)(5660300002)(26005)(52116002)(66946007)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?IYiZQqqVONP3JRvTK7qd26+D8hWWCpI4plm3sk7pM4hmeY2RGogS7Ayoqnd7?= =?us-ascii?Q?oFEVGmc6khXc3zs6exLZ/BdFxhhhYDDZFB6zYE405Ri07JM+OOsWJ0gj0v6v?= =?us-ascii?Q?CRBBlvEkill5EISaKka/KryT1ge4kMpFpbZ1L67bExogK5rJF1XHVxDypc5J?= =?us-ascii?Q?mRid8Q1juBiLoqm161PI68QPjy632/91XSVr4G5YzCEjlcaslKu4EtpA76vv?= =?us-ascii?Q?ZJRAryFzouF3SrDVJKN/OXoCGrigvbexuKb/ozllkqal3osZXpw91oIbBuhR?= =?us-ascii?Q?rjrOBrvJR09ILkTBMJqdKfgpXQijMkyvpEK7eva7KTY91zBhGY0LeoXq0LSl?= =?us-ascii?Q?UP2+sob39nQY6hd9uvT5WWjKnyTMnK4T7JJtLo6V1z9LR2nRFU9wOmtmpxtZ?= =?us-ascii?Q?oqwgrXTmX6Ej4LsDwNHJ/ukg1UmLpPmB91EGLibHnJz/N4JjRKUYZVASmQld?= =?us-ascii?Q?ocreWxcAXCYB6mIvVrn79nyQSxnH9g3HFnZLCiICU5dIQbHZFF03wXFyUKDi?= =?us-ascii?Q?WGiwS1RgmCLUDnQcuuOOWD02+lttd/eUctudavzJ0P10YBHrt7kZtZE15sId?= =?us-ascii?Q?u6eMtMrbxtyEUV9AgsCg4tIz9RfGbSoo6y2Xrn3zbJu0uyyG56DZoxX9eH57?= =?us-ascii?Q?IXGNFyc+JPmJqCcv3jE8jXhABLpzoRDO2azH4re2PtvOrHM0k+7pzgSnXwpS?= =?us-ascii?Q?qyF3LGG20uwcb2n72yWlhwxlzV6g8pRZc3GctSjcIL6lyz6FnZ1b9WPe7KaK?= =?us-ascii?Q?cVPSCxwMN7oTqEyiN3IIG0Fw8DNIUoz+dQulgHA/ZhqdX097lVJ3lm9+7OiM?= =?us-ascii?Q?oM9MvF5UQ2pYqpdr6iN3VTjGIT40Lril8pDr/7DRsFW3aGhAGGsc+ln02IfW?= =?us-ascii?Q?B737LkkhFvDvqxzAboyZjeA8ErgiQwn/cZ+LhGurIEL7r+gPTFn2q8jzDFFJ?= =?us-ascii?Q?a5f1yUKUqUnhgfs0I106ZioVyvBVUgn/tKGS+Ng5nNgu35NlA2osQd89MHNv?= =?us-ascii?Q?aYG+K0FxUgSaPQtjLxbt+4+V9+0y7PxWGRiwzH3DzoYISZ1mW5dwlkFlFb6U?= =?us-ascii?Q?3oswxP9jrfcnOfAkBfaReHAlf2LnO3qy28BfbmAZ7m35BIvoFgytkrtpC1d3?= =?us-ascii?Q?DMkToQ7WVcow2R5IeTJCWeEMXoyxEi+chtnprTCSEA8UJizOY5NtF/QTzbUO?= =?us-ascii?Q?PyhwOR396Bi/HdP1mbph6blgPtTSaYDn5bbB/V58z+My+a8b1qJRcEbNAtqb?= =?us-ascii?Q?Qjz9B3ds3apaDpA1ZDnhQpyivNeKlO50qbv42dpuwc7tRfYhEjn+ytrOgvaS?= =?us-ascii?Q?SRO3DhwgulbxLaFZAupCmdqm?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0d13918-5a05-487b-1888-08d924d23859 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2021 07:52:35.8961 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: t5WhQQ5d+tc8N4+s867/vf3kAn1yq4Chiziel+11J5HHg1kZ0ycULdPv19DvuG+4/jOpzKJPEDMMfXMoS0C1kRFJf7Nen+fO9MR0id5hGCE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB2099 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.14.133; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-VE1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" The logic around **child is not obvious: this reference is used not only to return resulting child, but also to rollback NULL value on transaction abort. So, let's add documentation and some assertions. While being here, drop extra declaration of bdrv_attach_child_noperm(). Signed-off-by: Vladimir Sementsov-Ogievskiy --- block.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/block.c b/block.c index 84cb7212f7..c0fd363605 100644 --- a/block.c +++ b/block.c @@ -84,14 +84,6 @@ static BlockDriverState *bdrv_open_inherit(const char *f= ilename, =20 static void bdrv_replace_child_noperm(BdrvChild *child, BlockDriverState *new_bs); -static int bdrv_attach_child_noperm(BlockDriverState *parent_bs, - BlockDriverState *child_bs, - const char *child_name, - const BdrvChildClass *child_class, - BdrvChildRole child_role, - BdrvChild **child, - Transaction *tran, - Error **errp); static void bdrv_remove_filter_or_cow_child(BlockDriverState *bs, Transaction *tran); =20 @@ -2759,6 +2751,12 @@ static TransactionActionDrv bdrv_attach_child_common= _drv =3D { =20 /* * Common part of attaching bdrv child to bs or to blk or to job + * + * Resulting new child is returned through @child. + * At start *@child must be NULL. + * @child is saved to a new entry of @tran, so that *@child could be rever= ted to + * NULL on abort(). So referenced variable must live at least until transa= ction + * end. */ static int bdrv_attach_child_common(BlockDriverState *child_bs, const char *child_name, @@ -2833,6 +2831,10 @@ static int bdrv_attach_child_common(BlockDriverState= *child_bs, return 0; } =20 +/* + * Variable referenced by @child must live at least until transaction end. + * (see bdrv_attach_child_common() doc for details) + */ static int bdrv_attach_child_noperm(BlockDriverState *parent_bs, BlockDriverState *child_bs, const char *child_name, @@ -2915,7 +2917,6 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *c= hild_bs, child_role, perm, shared_perm, opaque, &child, tran, errp); if (ret < 0) { - assert(child =3D=3D NULL); goto out; } =20 @@ -2923,6 +2924,9 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *c= hild_bs, =20 out: tran_finalize(tran, ret); + /* child is unset on failure by bdrv_attach_child_common_abort() */ + assert((ret < 0) =3D=3D !child); + bdrv_unref(child_bs); return child; } @@ -2962,6 +2966,8 @@ BdrvChild *bdrv_attach_child(BlockDriverState *parent= _bs, =20 out: tran_finalize(tran, ret); + /* child is unset on failure by bdrv_attach_child_common_abort() */ + assert((ret < 0) =3D=3D !child); =20 bdrv_unref(child_bs); =20 --=20 2.29.2 From nobody Fri May 3 20:05:43 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1622534558; cv=pass; d=zohomail.com; s=zohoarc; b=V7TGN5edKvKyzMy4nhtTv6lg8xmd1sFK6vOjQ67aY2+6DzkTnu7VfuMiAU8wNTp1quRi8XHwldlbH7sQ2dYwS+q9IeNl1lbro8fHjHf/tDEhKb7AtPSQ0Pw7AGTk7VC4Svd5t3DJJbVvz3/0A6N+dHdSADGuRiwqkMFQ8wu5Ou0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622534558; 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=TfJ9NdNwslNtptKEC3Q6SJ8I0/fssllUz20VkHaj/Go=; b=AI4DckKsmIVVceKi+NzyAok6yaBzNHQnjS1eDItCZnBHujE08+/vx7Ef7782f3mMSIwxcvLTPD9uidbSaQKRk9dWskAhgbVHf7hTsaKzw9vKGfQ36KwPH43kALDtOkgkrXKFq4TB6LaZ+slLSfZHJQOzOG1xSI9FyYm0Xpjlojo= ARC-Authentication-Results: i=2; 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+importer2=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine 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 1622534558785735.4671241232139; Tue, 1 Jun 2021 01:02:38 -0700 (PDT) Received: from localhost ([::1]:50874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnzMD-0006bV-Nh for importer2@patchew.org; Tue, 01 Jun 2021 04:02:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnzCk-0001kb-UF; Tue, 01 Jun 2021 03:52:51 -0400 Received: from mail-eopbgr140133.outbound.protection.outlook.com ([40.107.14.133]:29384 helo=EUR01-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnzCh-0005x4-SV; Tue, 01 Jun 2021 03:52:50 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB2099.eurprd08.prod.outlook.com (2603:10a6:203:4d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.24; Tue, 1 Jun 2021 07:52:37 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%7]) with mapi id 15.20.4173.030; Tue, 1 Jun 2021 07:52:37 +0000 Received: from localhost.localdomain (185.215.60.210) by HE1PR0802CA0018.eurprd08.prod.outlook.com (2603:10a6:3:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20 via Frontend Transport; Tue, 1 Jun 2021 07:52:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mnlBhoByHzWqO0ZImeGmloMWiFBt0f/WNorIeRXIB1ni1Cfvp/R7AGxYKg32IoyubapppSLNR0lIixWK034R9IUgLpA86JalrjRRRKdvcSJkqEHcvi0G5yTHng7RqpQZ6p4Q4GuSUsMi9XPbEB9+04NK2kp1rUb/QrTTjkaA/O9NxhUS9q2V6sINsdBgv01QQ3sN/fY3Ik5atk1j2//vwKIdRXC0aiXQPBAEqq68QsMqg2S/rrr6SzA1bsydCSf3SxKQRGhLJJt4NGig9OqC0wWnJiwjA3m9w1vbHdhBIwTLGcAbK0qatViWdaBjt69e1jvq6bUBGYXSPiiBmOEqVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TfJ9NdNwslNtptKEC3Q6SJ8I0/fssllUz20VkHaj/Go=; b=I2rSsneK48VQ85iVEn0vxNGZyAZ2/KyorZUZu/SWirZYhlOLAeN3ULvwMyJuaDAxNi5uent02V/VZ9DZuAX+xoTRGod5ac08fHM1HX57kqfNtrP91LtWRJlBifF+EPN/yDxOUnrK93w9TyP3y+FoWPl7GpNuhDeLxYTZvjg8aUuwVZzPoPkoGE6gJMe6wKycluzYubaz8UvWgEr8hEbTDu+ChcXV4EF4549oMPtUkV7KNKDsLY8bsrb5D3NMafVdQa26/PcM4tbacQX1SPHw1CZv3lzt6F4D/+MWsYOgPjUU1hgfTdYu8QHSxeJceCgcoyt/taK7VnH/zK4kd3+1Ww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TfJ9NdNwslNtptKEC3Q6SJ8I0/fssllUz20VkHaj/Go=; b=ZI6rJIcJnOJ5LOit2ajDc1Kb3lm7ZPnJO0EEw8nqC0CNFuCfhncj/jqBYxsUYc7jFKUdUWfeATt6DQJDJRnNqjIJLGizIb5A2lubZkcOMp9IBr5f5otLTmDz5cg4D2Z+VF6hJIEBlsfwwFq6QQP7KCop5PslfxtfOEwC5xIYBpw= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, mreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com, Alberto Garcia Subject: [PATCH v3 2/6] block-backend: improve blk_root_get_parent_desc() Date: Tue, 1 Jun 2021 10:52:14 +0300 Message-Id: <20210601075218.79249-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210601075218.79249-1-vsementsov@virtuozzo.com> References: <20210601075218.79249-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.210] X-ClientProxiedBy: HE1PR0802CA0018.eurprd08.prod.outlook.com (2603:10a6:3:bd::28) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3ad232fe-6948-4ce8-b394-08d924d238f7 X-MS-TrafficTypeDiagnostic: AM5PR0801MB2099: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:334; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5xRLFmvlFZvjF7g6Tq/hchc6TxPhGQRG4p2E3eM8m8B1Skb4oBnzuiyMKhMEIOpot2fvn6ivPuFwv1Unz5b3xSSrWWos4GKlQAZfESJ+IMaAHktwSaeI6DBJl+C12ODCc0WUUHoQzb7e7RPylavlCWWUpahqVUwwlJDzRgBMRHvf+0hrk3TXfIF2QX/2Csk13trIyu2DxunfoNokDU/iCTCJH6WGAXUCfztZv529yyOT6LIQm7+Ro89wnBtLbexdcRCaDYq6bnAaXV9UwMjQvBMtXc1sVF4epaRpXboT/HlqmbzJNLLMhWh5Ye3NbeA+oX3o/KHAr65qzEzFB0ZoDxVghGJlBpBGLo3/36/tY8cSx24b8gvJ+o0SvUXsX7aE8c8g6mKCHY51Kt+DqRtYByQGuI9NXAjzDWh7oTuZPT8O9TvMunGH5F0jlEPhbhToNgf3ni+T+6xMC1XYnn46+wSH0mxpyc1xHa0lidONkgSAZkcj1mWTvWbp6qWP3rgmSqIFP4IewQQgP2skAz/nrEEHlt0743h/rKOJ9gBVuLwuRO7gihqfW+ZNSs43RASE/Rq2jkB+2RZyoi8g8mXBZzOzQGBy5iDy6FhbuOXFFG1hft2f7ppuYB31bzfKRLKjlUqnvG/ValiJCl0rKnT+5dyvK574sYUlAfX30AvYyA1yESz8NHnmZoRbEhXQKqw/ X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(376002)(346002)(136003)(39840400004)(396003)(2616005)(6512007)(8676002)(8936002)(2906002)(956004)(36756003)(4326008)(316002)(83380400001)(6506007)(86362001)(16526019)(66476007)(66556008)(38350700002)(38100700002)(6916009)(478600001)(6666004)(1076003)(186003)(6486002)(5660300002)(26005)(52116002)(66946007)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?HJYO86bxYcH3iuraDcsC2kWhLvuuiI6G3z4OGbBpLiHRxxWfHJfBUf8wym5c?= =?us-ascii?Q?uQLWrfLsV9c3hkOCMMP8mu6HXeAFyeDW1ZPsLmubjzhc9h4QUH5JVybObCXF?= =?us-ascii?Q?Tweg+D2IWoZZUXaDz28j3OpJSagDxHlH2jfaAKGSBXfJnLPYyjpdZ/tdsceO?= =?us-ascii?Q?55x7979Bh/IeHB0Xl1aB52+zzmFnCK7+3slXqZU0OQZQEP2H16Vr0y7BFC35?= =?us-ascii?Q?L9VhI+vf0Oqa0+jThUJwY20M5kb+WvqwrSS0PRmMh03xCrbmFF55iqqpXCMz?= =?us-ascii?Q?ij/QQmtOMAmGuLjZEMurjg1058KnvDRELzeX7dkcGLGhXISir6nIryfZ9Q7e?= =?us-ascii?Q?odUEKtiPLJP28RA4RKoil2QOwYFhRz6LFAH95f0natpiS1b4Um5zG9CIKKK7?= =?us-ascii?Q?rD9Ux+/2HwFmiQ8ms2d3LvzQj6NLHz/J9PW5evkP2TA47Cv2hRUSLmuY4qaE?= =?us-ascii?Q?n1EBF4iyQBSa5RtYJ4rppk1SyDtzIjta/nVLYagmwh3BmX42NmW82JLdgKrk?= =?us-ascii?Q?X2KzHhKQbz5ttouW3E3qX2bn6+Y95k7TFNQynj8z8cRogyWDFhnc+UgHEeDH?= =?us-ascii?Q?XaK9Gyw34/mIgms3klImQthQW7gL+ezIzMKVrIfADX5HxHPNAS/yVUN2uVTk?= =?us-ascii?Q?vK2PVNLAbWxtpswIOr2iIwMj1kMi2/Gb3wyKwOtxynv+sjyvifCKYHUL2OSU?= =?us-ascii?Q?YR0QlpW45EvAbd7IunsK9WpEM6fFGfnE1UeFNKtvfrUfvM0arU7CJVPg9EoQ?= =?us-ascii?Q?mnBVhEFN3WYq1c3tZTcbj6OdJAmPLIKT+cylHSYMaosbe799YHjFfnC9mXu1?= =?us-ascii?Q?e9eh+ZDpeYLtwJfSontKsWApFjPB4TQD/ALpvfgjjEkcOsuDDZ1UD/2kRMse?= =?us-ascii?Q?9qz3RdI5GPoZSguPM8KQnIacIOQ0bfhcIiQP9pnwUzJgv+qs1Yl6viyDxCaK?= =?us-ascii?Q?1f6E0Gmd5SYHWLmJzYBKwtzQWSrhyVpuQEq9/PCvbmibp7/8m9BvOm5PMqBR?= =?us-ascii?Q?EX6D6xJrrhTfBKj2sw9y8S/FywgJtGbmQgqIByrIrAKZoSYF3OKTSTNRDSCM?= =?us-ascii?Q?Q7jHeCk8Vz8xRjUrLltzo3Pz+aUNTDb9ReGOuouwZyI5PMfV/okFTFy2SJjj?= =?us-ascii?Q?IX053XLNh7N+u9OsQtO83hFNKX7nUaRTZ1VLYSuXzm6DwZdrAUB7nGrC9ESz?= =?us-ascii?Q?is6RP5v/uceXQhixDG+yllAQHPnkDxXivLSNLOHuOrJCiEEgb/G/06M74JIF?= =?us-ascii?Q?oRUqKHlhyv8rtYn2tHgPkY24o6s8qQ7xajqv25ucxD/Nq/Asd/e8fmex1pPz?= =?us-ascii?Q?n//aAYDeXEHqT8WTIKn5YifY?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3ad232fe-6948-4ce8-b394-08d924d238f7 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2021 07:52:36.9494 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vb08OdWwqaCNsi3gKaFVNLMhvsVerJhAXSjreT8ajSM6HYJJOsCVwsPDuD7KnemfgHVomrFTazE8RUEN/hK/b2GdOYk8AUpC3GpIEY5JDt0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB2099 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.14.133; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-VE1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" We have different types of parents: block nodes, block backends and jobs. So, it makes sense to specify type together with name. While being here also use g_autofree. iotest 307 output is updated. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Alberto Garcia --- block/block-backend.c | 9 ++++----- tests/qemu-iotests/307.out | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/block/block-backend.c b/block/block-backend.c index d1a33a2c8e..5be32c0c42 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -141,19 +141,18 @@ static void blk_root_set_aio_ctx(BdrvChild *child, Ai= oContext *ctx, static char *blk_root_get_parent_desc(BdrvChild *child) { BlockBackend *blk =3D child->opaque; - char *dev_id; + g_autofree char *dev_id =3D NULL; =20 if (blk->name) { - return g_strdup(blk->name); + return g_strdup_printf("block device '%s'", blk->name); } =20 dev_id =3D blk_get_attached_dev_id(blk); if (*dev_id) { - return dev_id; + return g_strdup_printf("block device '%s'", dev_id); } else { /* TODO Callback into the BB owner for something more detailed */ - g_free(dev_id); - return g_strdup("a block device"); + return g_strdup("an unnamed block device"); } } =20 diff --git a/tests/qemu-iotests/307.out b/tests/qemu-iotests/307.out index daa8ad2da0..66bf2ddb74 100644 --- a/tests/qemu-iotests/307.out +++ b/tests/qemu-iotests/307.out @@ -53,7 +53,7 @@ exports available: 1 =20 =3D=3D=3D Add a writable export =3D=3D=3D {"execute": "block-export-add", "arguments": {"description": "This is the = writable second export", "id": "export1", "name": "export1", "node-name": "= fmt", "type": "nbd", "writable": true, "writethrough": true}} -{"error": {"class": "GenericError", "desc": "Conflicts with use by sda as = 'root', which does not allow 'write' on fmt"}} +{"error": {"class": "GenericError", "desc": "Conflicts with use by block d= evice 'sda' as 'root', which does not allow 'write' on fmt"}} {"execute": "device_del", "arguments": {"id": "sda"}} {"return": {}} {"data": {"device": "sda", "path": "/machine/peripheral/sda"}, "event": "D= EVICE_DELETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}} --=20 2.29.2 From nobody Fri May 3 20:05:43 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1622534077; cv=pass; d=zohomail.com; s=zohoarc; b=KSVyZMosCRRAmeE7sE6mYQGGLVqs1KVGmG0FoDsZUWK1GZeAh4QcKB2Pa/7OJ7nvG7k4rI2YWJnHa6IIJQyYtHRTClWUi+XcxiDvmSFtUavWK9i9BKE2SER8FUHv9DH4FFT8eYaSVIQVumO2YuMOTjRT53Zgq56B7hs3IU/Bspo= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622534077; 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=a195fif5d/Qp7zE3GUopT9eeVo1R/IbEJqdjDUE0/98=; b=RSO+gUogz3kB7I0zI8ZiIZXQs546fm5wktZ1Maai87U2464OEI2hqQqyrzXO84ZmMefeRLPKdBi8X8jEqQquGYFdb64/Rw0jovyRZmx82OelPZ4eMb6xbu21GmNk3zJ2BqZgYxJrlnq6/zgzLSVwjMlG6oOpk4T8re24+qUbqMU= ARC-Authentication-Results: i=2; 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+importer2=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine 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 1622534077204852.0220742993673; Tue, 1 Jun 2021 00:54:37 -0700 (PDT) Received: from localhost ([::1]:35164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnzES-0004IS-6Y for importer2@patchew.org; Tue, 01 Jun 2021 03:54:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnzCg-0001Zr-Q8; Tue, 01 Jun 2021 03:52:46 -0400 Received: from mail-eopbgr140102.outbound.protection.outlook.com ([40.107.14.102]:37351 helo=EUR01-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnzCb-0005zI-Mz; Tue, 01 Jun 2021 03:52:46 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4952.eurprd08.prod.outlook.com (2603:10a6:20b:e1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20; Tue, 1 Jun 2021 07:52:38 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%7]) with mapi id 15.20.4173.030; Tue, 1 Jun 2021 07:52:37 +0000 Received: from localhost.localdomain (185.215.60.210) by HE1PR0802CA0018.eurprd08.prod.outlook.com (2603:10a6:3:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20 via Frontend Transport; Tue, 1 Jun 2021 07:52:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H82QuKsqldF86Lov5S/wIXwHp59wb8kznIXCMJPnziIuxC2uHJ0b1k3xe8//2m3EO4yc0YJ7RAhTUq8p5/XrnDaycAXf0P2SkP+QaiQa5NRaiapM5CFzzeTV3qGLFEADzjMM9aQeZsm8Plfo5nM8mrkNp+a93dIDULjq4QA/N33oi1Qh2A8vWiioipciLngLYIe6k1TlX9C9/hN0E0hKCbIzcLiCugRl15bSJTigoZNiMK49qqpZ1s/73Eqertga3iNrj0wF5O1Kca79DQwcZNOBQNg5+uknBSC5ttE72HKd8wEsIJVbgyOs3ayRzYdsB+4PIu4iqFMPQ1WIgeapPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=a195fif5d/Qp7zE3GUopT9eeVo1R/IbEJqdjDUE0/98=; b=l+Gh8iu2+EncArjVszKBNCeyCTFQrl6L/z9QdYmHhGOaoXmXyG5uYXIQx9giqw/2ZhKKS3hkczN3Dtgi/nsdHE7h3Z5roeTZZyk/C/dBnNxDqu1myzdpC2Rqij2k92UMIJ6b/tcyuJv9UIoGFpOtFV+hVw3PNrqZsdlAqyLROVpMO4K5uBDeI1mODc5sNPNQ/Jl7AQDiuhbxtp03GRiMs3W+1YP/8ZLFqQiVp282xLNn4I4iXuX6i32girTnNZdl8Sb6B6O7G+KAmZF0Cx/+LnY4oSZ7MnI3umHP+LrZBQXUbO/nBHvmCGg1DMT+D+wzsMknL4vXBct8qpucr/Gtxw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=a195fif5d/Qp7zE3GUopT9eeVo1R/IbEJqdjDUE0/98=; b=Slf61Fil+E2rc0sUxctAJzY/ucTAHCgEx7yPeEY9k5dkgybQBqKO0cKKmSS/iMv52hqvhMeOFhYLfHnpDcMP99+9jg4812O2cGvmTqH832EEWPzBEpAbltxgWksXHYrg8/WEwXcpkNuRIRZQYcCgfUq4RKUShGeC82LIR2LiVM4= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, mreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com, Alberto Garcia Subject: [PATCH v3 3/6] block: improve bdrv_child_get_parent_desc() Date: Tue, 1 Jun 2021 10:52:15 +0300 Message-Id: <20210601075218.79249-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210601075218.79249-1-vsementsov@virtuozzo.com> References: <20210601075218.79249-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.210] X-ClientProxiedBy: HE1PR0802CA0018.eurprd08.prod.outlook.com (2603:10a6:3:bd::28) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ac267242-65d0-424b-68ad-08d924d2399a X-MS-TrafficTypeDiagnostic: AM6PR08MB4952: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RyvOSllRM7fz3+d/Rz6n6oN5zEeQ1K8XUr3et5a+LcVqdtFfM9NBEO0LQO4oMY0HG7BpG1uCBRrgeSIeHFSaTDR6HNwCEXTGVaRIsADfgqpZOrf9OgzohY/SnR3m7eitERc7GpDcYqfgPHqOd69+cT0pdI18jJP08+fSHHw0tB7NOSvhJTGTk6mFoNW5jYQLVtoZfUsWAaT8PeLmITV+Daz0Qw7w1NSnLSg+Zth5nZkxYwMA1pYkV4To2ok6HuamINXCu3+JlK9MvyhYu4cKOcnji65BN6NckDaFlmn5pDdZxN8CDt3jKJZ3C0RV1Ih9994T9GYvy73SpE5gYC16J+N9FWRn2iL+FKe2BUFkt/fuEAV+WJHSeysNMOhzRCZda4f7cubR79+g+ljwG8BD8nJqyi9909wIF7M9WrqejR+ghrKJ6gYlD9NLTs0lAoakQ4Y/UMHEzOPYgSRRbiTgVx3h2y1wO/MLGnD+OhRKWpd5KGwp6eOr318ymQ/+BUrPlzPRTi8G553IDacU8DEf8IcENWzTZ0p3fM+CCSYX6yRCCiVxxVYNwnGhOrmlX1zvpHBLLNRFpYfVq93iQvCmiwQlh6hU2ktYpSVdUi1ezgsTNwoyiriOr7T4lYiJ8lCnOMYmZRlImvKjBmb7DhhKW1WfwbL/mco4ZpzbzU64pkG7PXpIh8prEaieS2cQ2d3+ X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(366004)(39840400004)(396003)(136003)(376002)(16526019)(6666004)(186003)(66476007)(36756003)(66556008)(956004)(8936002)(6512007)(2616005)(6506007)(2906002)(8676002)(66946007)(5660300002)(38350700002)(38100700002)(6486002)(83380400001)(1076003)(26005)(316002)(86362001)(52116002)(6916009)(4326008)(478600001)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?irc1RXEtnDmncZ4/dpAm4QRrNYkQZ73idmzoUO0IaT15Hn1EMrc3ilaNbv08?= =?us-ascii?Q?gBYG3uF0yZQ1cLyFiZePL4N4Q7aSY0cmWWfPWGZTFZDRTBpJj+6+gAvGWz2h?= =?us-ascii?Q?BSsxLo8QeePQHACSiYBnmVxi1mZW2USRgmtHqmDNCR+jsMeZWargnpmB7Xnp?= =?us-ascii?Q?xr2eeZkAHwmDBWS3i6F5ewMqJP2Z8sb8+8eWKBxfVWosRz9A9QeZT5pSGYZs?= =?us-ascii?Q?svuEfk08el2LljmCIhQOn83cAc/UO7BeM5imasRnT9B3vzAIVuz52gZ4F0W9?= =?us-ascii?Q?b6oT15+dh2ywEe08HjxsBLtMXOODtpJy2oQedqcN9/1kZvyI341IrHyOlrIC?= =?us-ascii?Q?2Bv51uV8KB/8ChdUMH2ZmT4NFa6WRy5n1cHr4m7CGpU6JDM7wshwqXHon0y3?= =?us-ascii?Q?an3sAd6pNb3HwRU89ngBukh0JthvBm3vd7bzSiPq7KS/JFN60hhu02Kb6YnU?= =?us-ascii?Q?oCNh5xrIJbX23BW9ZykO4WwZPf2tXjl/Wx13DGXWUU2As7534PLlO+zIpFoS?= =?us-ascii?Q?WxR7zhYTayHTFwmQxImEeWH3HigSiKjMfDfCac66UKveEgSuiAjH5ihcFJ1L?= =?us-ascii?Q?/Mb19OiRGnr07mhIKiu3WzGdww6EPdsPEsj4KOykt1FJJ1qyBSyBI3Kbx8Hc?= =?us-ascii?Q?U4B3JNEYpxmq3uRuGQWUt+XF61Rh6BAF0gXp9vqhuJXOj1+mg4ZEwBAukipV?= =?us-ascii?Q?GNlWCF1Xi3a+ozA4C63gidePmLWF2pOdLN7bnf8TWhF11O+bo6JfMfWpZpnb?= =?us-ascii?Q?WKFnXHkEpK3SLx20BL/aM5wHXtttFoAas6WvCR/khYFwtgXaj8a4vRAWrAZ4?= =?us-ascii?Q?p8Kito3G0AHr6Onj8KiZ0NrtEEsOdw3N0uLKcUADw4/8FMz2VCA9s3zNet7M?= =?us-ascii?Q?Iz36HJ5dsfC7Atej9z8yqTcGR8CDDJYbsISZkMxJ6cYlHcZKOB6FPr7xOPUA?= =?us-ascii?Q?ktHHPusn/PRPEnZ+agOeQ70DWgJ+oh3ArXqSBe7mic9JsYr7+/phIMEhn9fs?= =?us-ascii?Q?QbX2wo2JpyYcoY5JAebkdvRAHVrLaTf7Ztahajx1Zuvm7fjDIpfeAaL9PA8r?= =?us-ascii?Q?fm+FoBcNYwFFzDlDlK8MCHCk8/Tm7LApOGEHnxP7lR0EPlywX2Rt3Z3D8xRY?= =?us-ascii?Q?dm5Z5NjcBqJktqYYJS4gRHJBTX2nPJmhEKfCXu+6qbp2J+4+2YZJMeHIeqNQ?= =?us-ascii?Q?dJfzDEuCelIVAWXSwz5zj9MzuWeRDMH0z3YEASjLOEhouu1WftFmR92oMalr?= =?us-ascii?Q?RjOelHdCPhMn43QbKJoJyuwMMcwM6OoDJQpKqE6k2T/KBrqITk1K/sz60m+J?= =?us-ascii?Q?mQdJDZUn+5dErNxamHvxn0Ob?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: ac267242-65d0-424b-68ad-08d924d2399a X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2021 07:52:37.9212 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: up7Hfh1cR3PcWm2aHjEWnezUILVNUVvDDY4tUbZJwjEbOhxMRAqOgXGPryrr8z7AxOMdGRDXQkS+SekpRgV0t1nI4SDrTs/2XaxZZZcbrfU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4952 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.14.102; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-VE1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" We have different types of parents: block nodes, block backends and jobs. So, it makes sense to specify type together with name. Next, this handler us used to compose an error message about permission conflict. And permission conflict occurs in a specific place of block graph. We shouldn't report name of parent device (as it refers another place in block graph), but exactly and only the name of the node. So, use bdrv_get_node_name() directly. iotest 283 output is updated. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Alberto Garcia --- block.c | 2 +- tests/qemu-iotests/283.out | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index c0fd363605..94cb7b6637 100644 --- a/block.c +++ b/block.c @@ -1149,7 +1149,7 @@ int bdrv_parse_cache_mode(const char *mode, int *flag= s, bool *writethrough) static char *bdrv_child_get_parent_desc(BdrvChild *c) { BlockDriverState *parent =3D c->opaque; - return g_strdup(bdrv_get_device_or_node_name(parent)); + return g_strdup_printf("node '%s'", bdrv_get_node_name(parent)); } =20 static void bdrv_child_cb_drained_begin(BdrvChild *child) diff --git a/tests/qemu-iotests/283.out b/tests/qemu-iotests/283.out index 97e62a4c94..c9397bfc44 100644 --- a/tests/qemu-iotests/283.out +++ b/tests/qemu-iotests/283.out @@ -5,7 +5,7 @@ {"execute": "blockdev-add", "arguments": {"driver": "blkdebug", "image": "= base", "node-name": "other", "take-child-perms": ["write"]}} {"return": {}} {"execute": "blockdev-backup", "arguments": {"device": "source", "sync": "= full", "target": "target"}} -{"error": {"class": "GenericError", "desc": "Cannot append backup-top filt= er: Conflicts with use by source as 'image', which does not allow 'write' o= n base"}} +{"error": {"class": "GenericError", "desc": "Cannot append backup-top filt= er: Conflicts with use by node 'source' as 'image', which does not allow 'w= rite' on base"}} =20 =3D=3D=3D backup-top should be gone after job-finalize =3D=3D=3D =20 --=20 2.29.2 From nobody Fri May 3 20:05:43 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1622534383; cv=pass; d=zohomail.com; s=zohoarc; b=KipA4xAnW6adb8kacxFTRJx+FuN8NJSVYrbHsLFMz12qdY86XgOQXJFRRLUZRiloB/RIxZ2Ysmrflx4Y5Yu3Pi4ONVlrt9GbGA/UmzIDwWGTYOGJqdeUfLjH4Bd2NYGvpQNMQQoOvMB+hajxVPClBZdOxcPsfH0VECKRh/obuR4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622534383; 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=NGolGddMwJO+y/2zkrpYTTrWHefFadaxwp61cVHonuo=; b=LQJPottq5WucT++MO1fzVBYVnOPz9VBvP9UVdTcrbgp+P3/mZ5HnlDM0C7irRfhM8bZN4xHBhzS94Womd04EAcnuUnkFkpLFqf7ftCSi+nIdQwf4cAm/tuNMKtjEFex7AsKkIsbiimWbcKlmuB8RZJtZUo5WahWwUeL0ccKhBOA= ARC-Authentication-Results: i=2; 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+importer2=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine 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 1622534383465533.3617410211731; Tue, 1 Jun 2021 00:59:43 -0700 (PDT) Received: from localhost ([::1]:44768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnzJO-0002PO-Ce for importer2@patchew.org; Tue, 01 Jun 2021 03:59:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnzCk-0001jl-M0; Tue, 01 Jun 2021 03:52:50 -0400 Received: from mail-eopbgr140102.outbound.protection.outlook.com ([40.107.14.102]:37351 helo=EUR01-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnzCh-0005zI-KP; Tue, 01 Jun 2021 03:52:50 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4952.eurprd08.prod.outlook.com (2603:10a6:20b:e1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20; Tue, 1 Jun 2021 07:52:39 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%7]) with mapi id 15.20.4173.030; Tue, 1 Jun 2021 07:52:39 +0000 Received: from localhost.localdomain (185.215.60.210) by HE1PR0802CA0018.eurprd08.prod.outlook.com (2603:10a6:3:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20 via Frontend Transport; Tue, 1 Jun 2021 07:52:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MNH9AjMxjVD0mv0Vm43VVn+G/Qap9qYntU6NsElCQckDoX3cT11CXB4flUJRIWM3+JpcEhA4aq7rqKfo6Xd+ruI5zDHxce+PcvzZvDUVYm/afx9+W+6g2SAGght5tp3ds7ek5+z/y/wR0MYNuX5Kxg7HCCnL5DyUpmrMsFVlY0v6AehTx3KVRjxm4bMaVh7ViiMYbHlspa5lHCMNtunb1JRnBkZiGQ3EuYjGcEacxLqfqiUcfYW2zbXGHvnE75St/pLh7/gZlpbAiH4i+wcxQVBMtMp4vSTGcjmtgmsbgvwnDZ+TVmkOMYsi4Q87ZnV9RZuLBxA/KLqH6++85qlNCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NGolGddMwJO+y/2zkrpYTTrWHefFadaxwp61cVHonuo=; b=XmF377NQjRR9HgsBfbHxKsLQudvEJK9OwUb6NQ1eo+4OdSJ5Zyq4w1QqN/x975qHzKHVQTIuHWic4GtYNXHKWkEkhrnREd2eCm3h3wJC27lgChTiWKb9hozO1fxfLfHLREoL27h9pFcByBnJTi9tyLPc68uGVl7dlqO056s1BPvs3RyMx5qhZIeV1kZnibDLa4IxB4tiJImDzJu5ZOhEWiSQh18nznatQSHwtO/OPB/mg9Dpx30AdhsJRUOzfpIZsiUT/UtsmYvQGWpIDwE/0yp4+RF3hQB3t+WS5N1nkXuL0V9Dv8U0DP/ZpsE/fzMdiZkT9lKPZvOpcV+rmXX9BQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NGolGddMwJO+y/2zkrpYTTrWHefFadaxwp61cVHonuo=; b=ARQZWJoKAbG5pXy/UjerxvoRkk6b/TszjNpFiB1UWev1DVfqrxWIwWDwKCz54mfX4OKvGanvA+xoYSfVCHUTmFaLJ4mPlQftE9zSJWktWB0TzqW/6tfcPZucNP7lC3z+T4limNcpACcMK2G2Za7rKEivVwpzNgSaCExhQ2OFKfE= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, mreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com Subject: [PATCH v3 4/6] block/vvfat: inherit child_vvfat_qcow from child_of_bds Date: Tue, 1 Jun 2021 10:52:16 +0300 Message-Id: <20210601075218.79249-5-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210601075218.79249-1-vsementsov@virtuozzo.com> References: <20210601075218.79249-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.210] X-ClientProxiedBy: HE1PR0802CA0018.eurprd08.prod.outlook.com (2603:10a6:3:bd::28) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e07d1273-f16e-42b2-ffd0-08d924d23a27 X-MS-TrafficTypeDiagnostic: AM6PR08MB4952: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3513; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Kpu5iARvcjNMxD6hJ7NbI036sPCFOWshyYs56JVM0oR1Qijf8wgMWI5oYJlACxDwLU9DUbtaM0CO2X7insfmJfTzpKECMjWkb9DvIzZhgGxH8Nh6drpcepje12xWDt7g/XbVT3VFJl5gf+D2LKGRtbZkSO6a867OMFo4CRnfKug5nvbE7cnuuSlswwAt2uxTrOXhwI51LNtuTpf3UpJ0uWyPiN8Ft/e8menlTW0NZg3SBCT54eEBKxY0/wqTX+08BLwprIiw5Z5CRyfOzvQn4WmUYsG3RQCt5ALsyRhDFr5AjIoev8vgor2QKMl+WEZ648WKJc9ptxezq12x+CVIcNOb+uu2/B43nON0KNEX/e44Br/hcf1BwoxnmJT3vYDRc1Rb3FyvrGzfzzdLmFbtISB22jlSpTCrrzfLtJpXS3+602d7YPFen/C/OVCD/mSgW9p4XnYaQ1+/kXdGgR83iOY41VSE24Oj9Ve9wLmlgSdtcIaC5wQ0yfcWqG0mbr67IclqJeYCX8L1zTQRuYgWfe9yTtpXNpWoeyoy5ssCxn4J1pZCCdgTJHOCZdcNfI8gmbeutGQrcv+fjGo2OsMn7MVtCCeQZp14ejl01CoD6bQ+wOuu/iDcQecZC4sLVcd6WlfiIyVbgxZ3+0MDsRthGEf9/5fYGCrK5R/wt+1krUy3BeQHCC14UPoHEUY/iHdq X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(366004)(39840400004)(396003)(136003)(376002)(16526019)(6666004)(186003)(66476007)(36756003)(66556008)(956004)(8936002)(6512007)(2616005)(6506007)(2906002)(8676002)(66946007)(5660300002)(38350700002)(38100700002)(6486002)(83380400001)(1076003)(107886003)(26005)(316002)(86362001)(52116002)(6916009)(4326008)(478600001)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?1xeF5Czz3ilQ7sVTez7kdsWMOlFd0kW8Sg6yem48PbwkTpIwcvGQvBMbmImJ?= =?us-ascii?Q?VJduB/C+xSO+waaCKr2/IChz53qtiL+Qd3nKip96kkiPM7kTJUysCz1jpTOU?= =?us-ascii?Q?YsGDI03PxTkMhUoX9gi46UqSuuXYaQq+zJLGQEKlfiYETUbzeINLbTP0XVkX?= =?us-ascii?Q?3ylj8rXQaPB45BYuOvx+NtCfjDQ329qTUXC7zfTtJnj9PaA2sohh2WYgE6dX?= =?us-ascii?Q?DXr2GajL+Fh3Y1xOi2vytNCB5dkrozJJ6CAiFkniIu2rP+9KZsIXnGi4fU37?= =?us-ascii?Q?MyHI2UeDcqQEu2jolcBUuMw/3OiPhOiLZ3fRnKJwY37GJX/Z0c+LOeabImS2?= =?us-ascii?Q?fL8IKhNxmU5iIqfxA5AhlbDDE+yOcWOs0YMPSp6/cYnPnJsIg1BjG0+7lgvP?= =?us-ascii?Q?k1fwgnpjk8N5do5APpoxI+sJgBmg9GN1RndnjDF4qR6A+ZcVbPjgh41ENIkw?= =?us-ascii?Q?5ZooeAcE1GMlQlyRbMpXzvsQxswI6RHrGlq/e/6tRKFypqsj5pbF/WHVWoWJ?= =?us-ascii?Q?244wrbZhQ2knmMSlFkp80TB7I8dpbAe8h5CbHQ7GTk2L8Dg+wi18D+wWF2m0?= =?us-ascii?Q?U07skrIsMXqCXSoDkXQTj93Cm6pI946MDmb0I+h8m1zvp2KcrJmf5p0AYNvh?= =?us-ascii?Q?kEWc8HNQlAF1NfNCtBzsp916kGnGOz/PP06ct2be7nV2yZl2azVtrvqf/eax?= =?us-ascii?Q?ULGqMQJBZu5UDoq9bWjrhVPzygtaJQYqVG6WOYI+Tn+5oXgUbIZNifqDJRS+?= =?us-ascii?Q?JlrjcJKd++5bmuzebDtEQxJa0X70ychEx5h5aS2yZ/NYCOwDdCWFMHYQZj3g?= =?us-ascii?Q?CjK79LZD53USBgdm3/fquKpN3rDjJK7oa3Ddn9WwHcUFjxNhfDRkrtW6U7n8?= =?us-ascii?Q?iVJ7iSwpGPn/r1n+xy3j0x3DE9ZVyRT6ekJbC5fnTRrsI6CeGHghnwuNIBfN?= =?us-ascii?Q?++Reg9scVkcNfbZMvF28hpk1E6h2tqCwdDCwzE2bycNAmkGILeYxXpzzT7pt?= =?us-ascii?Q?xhHK2dK5m7KrtXtYEwGgzAUUXIMAshmU4/ItNPBkm61WIPDFuZU+prl6CviG?= =?us-ascii?Q?G5f1Aa55+71JSE667JUiOTceMFxZrCXLV2Wl1z9sMjZMwFr9OFeO1SiQCk3B?= =?us-ascii?Q?wX9+dq5i6y/b4VxMl3RFa3NlZr+3JQolQSqyWpYJbosS0xo8tmegonYluay+?= =?us-ascii?Q?1uKsmtgVNVDvtCrKRMvO9qO96EKnkrT6yX9I6ZSI4BkHGXyV/U/QQfCW3iSv?= =?us-ascii?Q?Fy0JBoZeTlJWe+ED1BpniqcUdmjHqqNAoIvBxrAcTftDA6F7FfWLw+CaVTl0?= =?us-ascii?Q?f44XZu7T3Ay2XPHyt0fHq3aS?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: e07d1273-f16e-42b2-ffd0-08d924d23a27 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2021 07:52:38.9447 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: iB93qZ9URUWaujQzKhfg4R0gKLeg7kU5m2ua+xOBz5DGEt0ofGNCTNiS0rF8mo9uSVY3OHp+oxodofAmJqUWGM1tXMBpVIqlh+QZCRtzr7k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4952 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.14.102; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-VE1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" Recently we've fixed a crash by adding .get_parent_aio_context handler to child_vvfat_qcow. Now we want it to support .get_parent_desc as well. child_vvfat_qcow wants to implement own .inherit_options, it's not bad. But omitting all other handlers is a bad idea. Let's inherit the class from child_of_bds instead, similar to chain_child_class and detach_by_driver_cb_class in test-bdrv-drain.c. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/vvfat.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/block/vvfat.c b/block/vvfat.c index 86d99c899c..ae9d387da7 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -3127,11 +3127,7 @@ static void vvfat_qcow_options(BdrvChildRole role, b= ool parent_is_format, qdict_set_default_str(child_options, BDRV_OPT_CACHE_NO_FLUSH, "on"); } =20 -static const BdrvChildClass child_vvfat_qcow =3D { - .parent_is_bds =3D true, - .inherit_options =3D vvfat_qcow_options, - .get_parent_aio_context =3D child_of_bds_get_parent_aio_context, -}; +static BdrvChildClass child_vvfat_qcow; =20 static int enable_write_target(BlockDriverState *bs, Error **errp) { @@ -3268,6 +3264,8 @@ static BlockDriver bdrv_vvfat =3D { =20 static void bdrv_vvfat_init(void) { + child_vvfat_qcow =3D child_of_bds; + child_vvfat_qcow.inherit_options =3D vvfat_qcow_options; bdrv_register(&bdrv_vvfat); } =20 --=20 2.29.2 From nobody Fri May 3 20:05:43 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1622534377; cv=pass; d=zohomail.com; s=zohoarc; b=m8H/83BB4hXyLgZe5hO7cmBN5tIYD8bDHkFmOsUmKwF3KY9P5HDq/6Z5Rj8UmKACWRO2rE8NiqRUcwtdWUF2fd11NXbO+M9hGNNwnf6CuxfAQHNfzjsFfCBqKyDeH46+zgqYCP/u9+DO5UNDl3qHYtODC9uQvALD2xpGLa3ZVvQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622534377; 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=XhXh0NUN/dV7dl13patV8q2QChP73rJHMrBKqjkd1K8=; b=Zw2P5D//ShrME29JMgFFcbupZlvboUjYYpaIW+zNzQH+jYOSngCNc8IQG3wESCRbEiHu0qnMMu33wHkDTRntIZQxBkuLpNQn+6VF7klI2QbZ9gf38FUbxx68xkG9YvWJHHcWFzs8pmuwyM4Lq3JjtDrkXhGwqVURarKeJBw7s0w= ARC-Authentication-Results: i=2; 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+importer2=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine 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 1622534377769641.1798567932692; Tue, 1 Jun 2021 00:59:37 -0700 (PDT) Received: from localhost ([::1]:44396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnzJI-00029S-PI for importer2@patchew.org; Tue, 01 Jun 2021 03:59:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46416) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnzCn-0001tG-C7; Tue, 01 Jun 2021 03:52:53 -0400 Received: from mail-eopbgr140133.outbound.protection.outlook.com ([40.107.14.133]:29384 helo=EUR01-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnzCl-0005x4-KE; Tue, 01 Jun 2021 03:52:53 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB2099.eurprd08.prod.outlook.com (2603:10a6:203:4d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.24; Tue, 1 Jun 2021 07:52:40 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%7]) with mapi id 15.20.4173.030; Tue, 1 Jun 2021 07:52:40 +0000 Received: from localhost.localdomain (185.215.60.210) by HE1PR0802CA0018.eurprd08.prod.outlook.com (2603:10a6:3:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20 via Frontend Transport; Tue, 1 Jun 2021 07:52:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SVvkpK2h11BQHQ1wThLhENaIwd22QwtCzdJsoRr/HOS7BVFoSHTQ52R4GuxOpmPARNMp3KQwN3Gyhcy55Od8NINWVEo39qPvAD0/qV9TY9YozQWN+AEpJQAyh08mW+pgQwQ1N+QM7jI8mkiZCMR76tkUMrfuuvXqHtnJaJO6bRW8XNFczkLHJnVdyBbDV115VhPKlseVk2E8FzhOUYNZDGeeWYviyTs53j8xvrZyksd/+C0i7J+2UbvxE7EdrHYrnSOLog7QQKgDGQX9dZuBksHYEPudgu4IvQACH5tVS/FubuklMirOUlk55VxaaJYH2fsxAaHGPVoKn5aWe4a7iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XhXh0NUN/dV7dl13patV8q2QChP73rJHMrBKqjkd1K8=; b=oN5s+VoFvTZdJm6tfLbG9y3ooZvS+oceicx1QjB8jGTkP7U20eKxohl9SldikEjhoBslhLBZUkExAAtS5AVLUKQhhF6j5wL3dSDUWfdDA309aFqJuep1vj9NEKuB2eYnCe9aN8gcnH3nn8feOccFVt1L6ZECEeZ8V4lGwSlBXRgFHV7rcllSxLYCWmM1uTcRYwGbyjv8v3F8wtV7T7X9HQW216JVabZYKIxD7f10YiOgSawEJA/h/KCK6U1DJ1DB/j/Y3ytnbjvAsP+l5jzbdulO27D4PpGC8QpZqTKYUBGt83yfK4gYk5bgUTRN1iyOV+M4rmwXZhNbpMJ5W+XLIw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XhXh0NUN/dV7dl13patV8q2QChP73rJHMrBKqjkd1K8=; b=D80Y/NbGntJVngUfkxazyybmfbc4hZPPbCXxWbOec26Zswtbn6lPdcHY6aZrf6tEsjDlDmzU6ueYLFd7t2hl2M3BsvEtz3XaUDQk7WrrKGPiDjQv678rdWVFmaeJqlwkHxoU76Vx5+UDg2Q4+bHqRwxmlj7AgYTnpzlelienGb8= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, mreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com Subject: [PATCH v3 5/6] block: simplify bdrv_child_user_desc() Date: Tue, 1 Jun 2021 10:52:17 +0300 Message-Id: <20210601075218.79249-6-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210601075218.79249-1-vsementsov@virtuozzo.com> References: <20210601075218.79249-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.210] X-ClientProxiedBy: HE1PR0802CA0018.eurprd08.prod.outlook.com (2603:10a6:3:bd::28) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 87f47806-c281-4f7b-18ec-08d924d23abe X-MS-TrafficTypeDiagnostic: AM5PR0801MB2099: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:191; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MHBKur/e0HVfqK17QVwl6Sn4+z0u0jUoC3hJRlPGATHj4TbnhJgrTQ2OXgTbtTogclqm6Ov8FC/v3sOn8ZZQLe47uLrm0zVnptAcJ6g7lg2eUjO2CaNB7KZjckSEp2rPPOR7wFZ+0JaQOnvFcTuWlW6kHAaRlIrfS+NqckaNDTpd6exghDorbHCl9d4phBOf5UwnwfR6kwU4dy3UVZo5f5GQTKfKIwxK86v+hkaRZaMQpJ2urViz1N2u6ZopOkq6U4Ta0GdQnSFjVTTfTqLtXpnlE4OINmzvJfnHMEYCWYct6sBwJdACZYpAQYQPBUNtslX9t7TLBhx3pQsBzDHmMOlSMVCd/vXrEJpqVugPVWpzpgy7UtZ6vkDMN3gfljIHx9nVinZAP5EKqFwAyBk9M0vkyETUryDhK1svhYNNCmmk2uuDpwUXFGu9+RNnuixxLkun3n4f7W6TTZh8PFg9OMYPOmUXl4b3ZEgPoogiMmy9EC2Omf5JzWuZhvtBWhT0Y0DewPQbg+GasCS5zP4viQafxEmnbPuvLP1uvL5ioBjxq+ZXuYD5ETEVPgOtJiJEjvMqh6UNZ/cyEHZk21eG2WGXPvmn6Ni5+Kk1bq6MMLKK3TwvbuXSom3+aJXH+wglNn8uXm9dy76WnU8XtvtVLXJsQrToYYzwObYcyjUMp9N9qlMPjdb6MECNKR4/mLq3 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(376002)(346002)(136003)(39840400004)(396003)(2616005)(6512007)(8676002)(8936002)(2906002)(956004)(36756003)(4326008)(316002)(83380400001)(6506007)(86362001)(107886003)(16526019)(66476007)(66556008)(38350700002)(38100700002)(6916009)(478600001)(6666004)(4744005)(1076003)(186003)(6486002)(5660300002)(26005)(52116002)(66946007)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?yypH4HRUt924S3795XGnY6qt82ZEdmh1JhWO+xdJPnPMSdmNPkJGE6gzFsz8?= =?us-ascii?Q?lO66HKS5Fv1BkHld2cb+9SJzpUuLfB84o1Z9Ro4lfd/RcYo5now9lNF93OP/?= =?us-ascii?Q?WtVnbQFGSDYux8CTKl1RXGolWIXe4hyZQDX0TdqqT40AIejo5JADUF5jknnY?= =?us-ascii?Q?OiPn0tHZc0CUNV6g3WwpqGPcnYozchWbPr46WIdLD36wY8r0IlYrFt+12lk6?= =?us-ascii?Q?aDuLfuJ7+BAlDfvtkxIK6Cgvphwuk25dmvxEpTC1byDfzo7AYBRp7EjYmQMB?= =?us-ascii?Q?F0bGOm4yQWX+VuYt7Gph1LDY0WB8jXpnJ5frF3Th9k8gp5DDrgpFpxfRM5y7?= =?us-ascii?Q?7kGi0IwmFfoN7FD+pWbuCG3SZhKZMV2GBEQS+F9oLhf39m9NPXS7I2nVjisD?= =?us-ascii?Q?LoBCiX56XuUC7+r3c7Lj2uNhMXG3QfxyCGVBIft4avcfCJT0QSBiy/c59tgH?= =?us-ascii?Q?TvYBoNNkhztdXi6NBMapzGRm3OXyy5XKh3BjGVzfMGsiFfNv19n310ev3u8x?= =?us-ascii?Q?JwIKzD8AZGNeaeyJbZny65V18AGxfrlIUMq0xFpCYAXKTkJF6usO6fXUPotE?= =?us-ascii?Q?cz6I7VW+6fnklUlX92AOtXOzEpE1oGVc1qqk3g9fKH/snbReByd6Z5R5tDxW?= =?us-ascii?Q?42NpmqTYGyA9FqbxwkXr/Dw+S/nVcx46tIFB0129PEFhdZxhdlRLlX4Ywrcn?= =?us-ascii?Q?7I1loSuWwsnpn9Z+fe7lg/xEITXio+WdapKMLehIpIil+3mibH+b0IEiAIZM?= =?us-ascii?Q?n0D/edyb7+df8yLZKSBL1pJtUaJ4mWd+dCzDFtagDU5xKBiYZW9zfZxIIbn0?= =?us-ascii?Q?wGHSqwMF5BA8PnyvQOZzVelPfyM3kwR0hX0W1eSaEDEVI3/idyVWjstIvJf+?= =?us-ascii?Q?A7pc5uFEK3thJjm2Clu+hnwxmvgdfG1XM9JgaGr2TNW8HqP35onVLN1t/g6u?= =?us-ascii?Q?jPe0qgtwz3Nd/JD4TRk47UsWxa1IxAYGAjwFz99KvoTLMbJ3FJlDxLOJKeNe?= =?us-ascii?Q?4S+fC6vJ60ZPtgbgfYIPMkkZgEwp8EM3QUHF1oQje1cOWFbaSGFrM7u/MbdN?= =?us-ascii?Q?3QNmyIPyu2Ln0MTgPiAih++oRFMKzqM8dQFhcCAyaTyn/js4AxCwI9smuJ1e?= =?us-ascii?Q?5QITd+LrKCeDCuLurv+KPj04Gn6ls/w5m2iqd9yYbl5yQlKpTMq0AXCa8Sq4?= =?us-ascii?Q?TOtidav+Ju8z9T0QixToDJDs9WqPjPWBirZ+Bw8IbHnSjWt/uR5IOSGClZvk?= =?us-ascii?Q?hojV6gdf/+ExY4bC93EM68UeqZSKQPaM3W8Rl3bw2L/Uot1esUuV49imBem8?= =?us-ascii?Q?OUJmEud3xlViz2hhyTluWe1j?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 87f47806-c281-4f7b-18ec-08d924d23abe X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2021 07:52:39.9105 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: U55oFpyqXptXPv4SV7E05SVa1OUD/cF2mUs30z0mssr2Hz2tb1v0/BDp3U6oSg+ejCefIxpQbesyZrQBV15ZtMexNwprhliSeGbngjb+868= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB2099 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.14.133; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-VE1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" All child classes have this callback. So, drop unreachable code. Still add an assertion to bdrv_attach_child_common(), to early detect bad classes. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/block.c b/block.c index 94cb7b6637..3c0c3964ec 100644 --- a/block.c +++ b/block.c @@ -2026,11 +2026,7 @@ bool bdrv_is_writable(BlockDriverState *bs) =20 static char *bdrv_child_user_desc(BdrvChild *c) { - if (c->klass->get_parent_desc) { - return c->klass->get_parent_desc(c); - } - - return g_strdup("another user"); + return c->klass->get_parent_desc(c); } =20 static bool bdrv_a_allow_b(BdrvChild *a, BdrvChild *b, Error **errp) @@ -2772,6 +2768,7 @@ static int bdrv_attach_child_common(BlockDriverState = *child_bs, =20 assert(child); assert(*child =3D=3D NULL); + assert(child_class->get_parent_desc); =20 new_child =3D g_new(BdrvChild, 1); *new_child =3D (BdrvChild) { --=20 2.29.2 From nobody Fri May 3 20:05:43 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1622534255; cv=pass; d=zohomail.com; s=zohoarc; b=HmNKI/quq8yml639YGBw8+csKa0TY4Xn1/MA8xZLY5E6lcmwIuygq+G8DThhw15RgwU5+ffubiG+U8q2ygx4EKTNY8++sujEK6j+bWCvaCRSLGmnngTjmC0nNrU1fN/K/U0LLFTNk8Yx1k0KRgle4mTw9i11CxKH9kB7ROTzjOA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622534255; 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=2ugDrx6656I21Q9+4KGzbnRyP17ZzGk3HQ7qlSgaZ28=; b=Hi/v6xHxnud5/KAi1kOk+aInROCA9ki1q2G3EIgdmPWk6FfwZub6MMZyFE5/mIyw3DQlNIGgXYBpitCjwXb0znHwgye1r52K2talvtC/WqXq4adsidwsy7ncbqoRvzvryCcSEUlZ1RVhcxThZzflL2oUEzdQgUDbLimFkzG3UlQ= ARC-Authentication-Results: i=2; 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+importer2=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine 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 1622534255849182.3835734079678; Tue, 1 Jun 2021 00:57:35 -0700 (PDT) Received: from localhost ([::1]:39506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnzHK-0007Hp-Oa for importer2@patchew.org; Tue, 01 Jun 2021 03:57:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnzCj-0001e2-1w; Tue, 01 Jun 2021 03:52:49 -0400 Received: from mail-eopbgr60092.outbound.protection.outlook.com ([40.107.6.92]:42213 helo=EUR04-DB3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnzCg-00061a-SO; Tue, 01 Jun 2021 03:52:48 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6502.eurprd08.prod.outlook.com (2603:10a6:20b:335::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.27; Tue, 1 Jun 2021 07:52:40 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%7]) with mapi id 15.20.4173.030; Tue, 1 Jun 2021 07:52:40 +0000 Received: from localhost.localdomain (185.215.60.210) by HE1PR0802CA0018.eurprd08.prod.outlook.com (2603:10a6:3:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20 via Frontend Transport; Tue, 1 Jun 2021 07:52:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RYJbXWuSaobvrefqfRuX2NK3Wmdm3uatSDcBemme+jmnAmLNxhko4NYg1ssLLmN29PYb0Q67YTZpxybRsqvMcfHbKhoOi+FxVP9u/AX5pf65tx7pwDHAYVTNrMcuL5lGXltDgUP/8URl1khxcW7I1VLYkn6GH0OXNlX2flDu70w9U6HOF8z5ZaW/bBR4U8LcYTj4MYXVLgNKNltoVAHwS++g+uWWsyA6z8srqubuEJvRSRV0YCYJKrttXopr48MzQFrChkps75dGmsBRVcOe3OTvRKsh0kOIjIfAFzEuHrhadDUVnm0w1194+l9RNp+Md4UgTo2R8la2NC817d6ocQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2ugDrx6656I21Q9+4KGzbnRyP17ZzGk3HQ7qlSgaZ28=; b=kjZEX84YDtqRs2gVQq/7fbxAeI5VkL2qr1RMLo76jCIZuMJCt1v+IHYkRdBAksnseRbBJ+qFpcdoTILkC5pPh8JwjZJZ/YUgHr0RY09ZKJAG9yyncs6RFmUy4hRS6cH3raLi61nDFdc1nCRuLisPsI2rexwiSqBt7eHMbXmGvN4FnxzUV5Y79QoiRMIgSVlI33CVfu0yqR6viCw7ojIvTkXigiSM2B1tG0FIfT09DggqboxqBfyV/L6WOX+wKdbZVMrUOAZx7vgL5DZDpb356ijeFcu8ynknspIBF7f/kS+0V5box/qxxum0yXfn39bT9J20o3ZaPaY0DpXxO28aCA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2ugDrx6656I21Q9+4KGzbnRyP17ZzGk3HQ7qlSgaZ28=; b=nRTvsFNvduiryYSe8ykiQeR0odjWCWmM4hVcbwo2AjjzQr3VBK86p9TjaVpA63+EN+9Aw1fKkVlSUPHh//c1SObQqaQgWprXP73sg87EjP69G2NM0UIFJpmOw2JWrp4E7fKBMFux2e1WZLa3HmCXuontfx7CJfkCRWz+BgoMPqo= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, mreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com Subject: [PATCH v3 6/6] block: improve permission conflict error message Date: Tue, 1 Jun 2021 10:52:18 +0300 Message-Id: <20210601075218.79249-7-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210601075218.79249-1-vsementsov@virtuozzo.com> References: <20210601075218.79249-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.210] X-ClientProxiedBy: HE1PR0802CA0018.eurprd08.prod.outlook.com (2603:10a6:3:bd::28) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 542ff7fb-f5fb-40ee-7ccd-08d924d23b5b X-MS-TrafficTypeDiagnostic: AS8PR08MB6502: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:142; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZP8R1d8vUrzs+ihyhqMiZmv418U543+zGypbI1a2NkgnuF7qRQD454PG1Z0hTHI78K91I8bGF8CYUOy/zK5KOAgQfRyyry5zl0jf8tomGcqgFNxCj7B+Zw/7PerWNnEIXdZdW7WxE8TThzdPFnva6xchBjPBavymI7Y96uwutGW+F+Piu5ywoL0FWjZH0/RSYwH4CGF6q9qh4Fgvx9OkjDmj41vgvZNcqp5qHiCY8PXEl8/ggCczzMdhjpjA8Yr3p1JfQlAvqH3vqDrbczuJ3R/cuSnWvBnxOEMqUV6+Bi4sV+ecaEkRvL6VHpuXPfeYuJCjNXpu1PXeZjMDBOhdSv43z6wo6Ld6gHVM8cnByBhIaTr/6m3Pzit6bHGaQi5yDixjEaVxJ1ADNstmmXujmMGKLUicL1llzX1z4qzeUPBZXIWiWaPNGPLLi6lSQwOhjDk2FOtie0q7nryPEZAPgljldBS4te4ecJxK4AUFKe3vJMdigluhY8WAwJSdcMgcduDhpfboCFqL/9z5zfvB9CGqV/CHLgtr91eOSUncY+jfeLRe3ZdQgIYWDr2lHhpVsd8fVSVArzSoazvfa0CU/3bjDoZ9Gva2CfrXZlO3iu+xn9J+0qRB9HGmrgb3kS5leIuIERJXvUZN70QhsD6VDjZmIFThFOnD/UjcaNoIQ3jh7vvpciIA+oU6ESXJF25c X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(136003)(396003)(346002)(39840400004)(366004)(4326008)(66476007)(6916009)(36756003)(186003)(2906002)(107886003)(16526019)(38350700002)(52116002)(8676002)(316002)(66946007)(2616005)(66556008)(478600001)(83380400001)(86362001)(26005)(5660300002)(38100700002)(1076003)(8936002)(6512007)(6666004)(15650500001)(6506007)(956004)(6486002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?TvlAEw/EMYqnZCUBIjTI96wAGJRGj8jnM0VT88/hSqHB/JZx2oR7jgLYWUlK?= =?us-ascii?Q?HqdV3TJFsz1L/ldGMNqabL3DCisrqR635/xoBuc4zoLcMqA7JKeiSepqP4Zz?= =?us-ascii?Q?7oTq98QMb5xg6uZkh/vV6PcE1bHhYijyJ6JRHebgIPBO0/C1SoYaMkM/xIGS?= =?us-ascii?Q?eZeszW5pAVwQfN6oHXSwPblJy0Avg7Vc4hpWyT9jfSNRSg98IkuoivJkua1B?= =?us-ascii?Q?Ob9YSSzdTW2JLbgrE8ueZrqMhTDlsdztkVRxAit6Q//Q4jxU3ArlEmoWr1Jz?= =?us-ascii?Q?++92jN7MrP/yDbMVakstrVpznu+0DM/kBfBUcAhWOeM8Y4H6KDZXtOJYh+HZ?= =?us-ascii?Q?URXiFX6XsPoUl2NwwWuqN+3Tmk4o28qiOQlvHkndm5ckA2Zt3AIa1HH6IB9l?= =?us-ascii?Q?InDhFAyJ68Ja9kgO/ZuAw0SenICicognz+5IuQv2ZovAdknHHwfxeKxA9dfw?= =?us-ascii?Q?pVF7ExOLPXOLJBUc9RXri0l47kU4guzEaH0+yirpp6SCEb4vv1kGqAKLfK9Y?= =?us-ascii?Q?7N0rLEisz/SfGiyYUB2w0/ZaCyAWbkWluX3WV87XVSikpZ4n7HHXoB1/hxUJ?= =?us-ascii?Q?AyH8Vzu6FzlWIOnDs7yZVQo7hQ0kdW5GWM7AqtVmxeMPjYI4IMmZKhc3O12Y?= =?us-ascii?Q?FzxIi1RImKF/zYIY52tWDhi6m6IErsJ9HNYOTLnVNlgLZA/IruZs/bsnodky?= =?us-ascii?Q?GjirIQthWF0NYf8THG7fZ1u97FGgwsBsVd0xQzhSn4TECATVdsASWHr5r9GA?= =?us-ascii?Q?C0nrHSdliC8SwsmnK3pGwXUtUF++9uq5tLoqdRUYGEvcLezxeEF3FkscMoig?= =?us-ascii?Q?yzLJo4u3wukToMn4E+ULrsQeie2jY/QqJUPhYg5ZOXkqqptkC3BZeVbstVAG?= =?us-ascii?Q?yU0IYmbj/a2UHBAuJXyGm6lCoj2f1ZdfB+sZBpUPK5DQtXRswzbNvBhrmCSe?= =?us-ascii?Q?srkU0htMEJ7GuAhdlzntUNvhedx3I0ZJ7Y/rcrxRJk0KIk/U6bZZuyLaRqgR?= =?us-ascii?Q?/xPNH+sV3Gfr6eMivzr0aa1wIeC+VixAC9lmWiOjBNOWJaiicXATe8qh0AH9?= =?us-ascii?Q?ZOpPtu1YZ1+oFQ+Sp/KJgm3uj3UENzegi9Y9R7PB37EFOqQ757Kz2a0Tl8m1?= =?us-ascii?Q?bGCtNKs5x5hPYK9+V4VJNYgrQfZz/tYF2/FS5gYJLh8Pg+i6sii8DnEAR6/H?= =?us-ascii?Q?lWOqQ4oVlT9keFUwgpa8wuinMxKSV7s2u/km5syFdkShvCXDj1EJA0ZJW5hr?= =?us-ascii?Q?38SisFxZHFyoaKpAxAGNe8kTNBtvg1mgJysfp4wY0TWKiGwc6EpnXamfSXOI?= =?us-ascii?Q?Q1LXoPwNQFewI8OdHcNTI0K8?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 542ff7fb-f5fb-40ee-7ccd-08d924d23b5b X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2021 07:52:40.8792 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: FfkLlCbGGl5X9/XQXv5Bc3V3ZPyde+IED/Ipdftu15omY2i13ejaIP/zgh2fmd0NeNckypaeHrDHR5X9Ch6gyoKzsJryvVaiOBDfbnELPjE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6502 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.6.92; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-DB3-obe.outbound.protection.outlook.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" Now permissions are updated as follows: 1. do graph modifications ignoring permissions 2. do permission update (of course, we rollback [1] if [2] fails) So, on stage [2] we can't say which users are "old" and which are "new" and exist only since [1]. And current error message is a bit outdated. Let's improve it, to make everything clean. While being here, add also a comment and some good assertions. iotests 283, 307, qsd-jobs outputs are updated. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block.c | 29 ++++++++++++++++++++------- tests/qemu-iotests/283.out | 2 +- tests/qemu-iotests/307.out | 2 +- tests/qemu-iotests/tests/qsd-jobs.out | 2 +- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/block.c b/block.c index 3c0c3964ec..3f456892d0 100644 --- a/block.c +++ b/block.c @@ -2029,20 +2029,35 @@ static char *bdrv_child_user_desc(BdrvChild *c) return c->klass->get_parent_desc(c); } =20 +/* + * Check that @a allows everything that @b needs. @a and @b must reference= same + * child node. + */ static bool bdrv_a_allow_b(BdrvChild *a, BdrvChild *b, Error **errp) { - g_autofree char *user =3D NULL; - g_autofree char *perm_names =3D NULL; + const char *child_bs_name; + g_autofree char *a_user =3D NULL; + g_autofree char *b_user =3D NULL; + g_autofree char *perms =3D NULL; + + assert(a->bs); + assert(a->bs =3D=3D b->bs); =20 if ((b->perm & a->shared_perm) =3D=3D b->perm) { return true; } =20 - perm_names =3D bdrv_perm_names(b->perm & ~a->shared_perm); - user =3D bdrv_child_user_desc(a); - error_setg(errp, "Conflicts with use by %s as '%s', which does not " - "allow '%s' on %s", - user, a->name, perm_names, bdrv_get_node_name(b->bs)); + child_bs_name =3D bdrv_get_node_name(b->bs); + a_user =3D bdrv_child_user_desc(a); + b_user =3D bdrv_child_user_desc(b); + perms =3D bdrv_perm_names(b->perm & ~a->shared_perm); + + error_setg(errp, "Permission conflict on node '%s': permissions '%s' a= re " + "both required by %s (uses node '%s' as '%s' child) and " + "unshared by %s (uses node '%s' as '%s' child).", + child_bs_name, perms, + b_user, child_bs_name, b->name, + a_user, child_bs_name, a->name); =20 return false; } diff --git a/tests/qemu-iotests/283.out b/tests/qemu-iotests/283.out index c9397bfc44..c6e12b15c5 100644 --- a/tests/qemu-iotests/283.out +++ b/tests/qemu-iotests/283.out @@ -5,7 +5,7 @@ {"execute": "blockdev-add", "arguments": {"driver": "blkdebug", "image": "= base", "node-name": "other", "take-child-perms": ["write"]}} {"return": {}} {"execute": "blockdev-backup", "arguments": {"device": "source", "sync": "= full", "target": "target"}} -{"error": {"class": "GenericError", "desc": "Cannot append backup-top filt= er: Conflicts with use by node 'source' as 'image', which does not allow 'w= rite' on base"}} +{"error": {"class": "GenericError", "desc": "Cannot append backup-top filt= er: Permission conflict on node 'base': permissions 'write' are both requir= ed by node 'other' (uses node 'base' as 'image' child) and unshared by node= 'source' (uses node 'base' as 'image' child)."}} =20 =3D=3D=3D backup-top should be gone after job-finalize =3D=3D=3D =20 diff --git a/tests/qemu-iotests/307.out b/tests/qemu-iotests/307.out index 66bf2ddb74..4b0c7e155a 100644 --- a/tests/qemu-iotests/307.out +++ b/tests/qemu-iotests/307.out @@ -53,7 +53,7 @@ exports available: 1 =20 =3D=3D=3D Add a writable export =3D=3D=3D {"execute": "block-export-add", "arguments": {"description": "This is the = writable second export", "id": "export1", "name": "export1", "node-name": "= fmt", "type": "nbd", "writable": true, "writethrough": true}} -{"error": {"class": "GenericError", "desc": "Conflicts with use by block d= evice 'sda' as 'root', which does not allow 'write' on fmt"}} +{"error": {"class": "GenericError", "desc": "Permission conflict on node '= fmt': permissions 'write' are both required by an unnamed block device (use= s node 'fmt' as 'root' child) and unshared by block device 'sda' (uses node= 'fmt' as 'root' child)."}} {"execute": "device_del", "arguments": {"id": "sda"}} {"return": {}} {"data": {"device": "sda", "path": "/machine/peripheral/sda"}, "event": "D= EVICE_DELETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}} diff --git a/tests/qemu-iotests/tests/qsd-jobs.out b/tests/qemu-iotests/tes= ts/qsd-jobs.out index 9f52255da8..189423354b 100644 --- a/tests/qemu-iotests/tests/qsd-jobs.out +++ b/tests/qemu-iotests/tests/qsd-jobs.out @@ -16,7 +16,7 @@ QMP_VERSION {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}} -{"error": {"class": "GenericError", "desc": "Conflicts with use by stream = job 'job0' as 'intermediate node', which does not allow 'write' on fmt_base= "}} +{"error": {"class": "GenericError", "desc": "Permission conflict on node '= fmt_base': permissions 'write' are both required by an unnamed block device= (uses node 'fmt_base' as 'root' child) and unshared by stream job 'job0' (= uses node 'fmt_base' as 'intermediate node' child)."}} {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_EXPORT_DELETED", "data": {"id": "export1"}} *** done --=20 2.29.2