From nobody Fri Apr 19 10:32:49 2024 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; 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=1620041992; cv=pass; d=zohomail.com; s=zohoarc; b=Gk27FT+8jEOtAASOzgJEMVOQWiYATbWJ4XIF6cv0ZWV+PEaiTpxtU7BT/fOccBrTYJc2h3y+EK5DuriJmlqcABlsWJyVRqCJXoyh8VkegSQ8okE6VwFQDjkpp8GFAIaKFrS4+fAzbdqOVa7W90r8lH4sMVMbCOOwyegfSg/g1GU= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620041992; 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=4cAEjoSj6guZuOB4/+LwW8DEDRGWWkcw8lDFFuIwXRc=; b=Czpbp0ZqTBHHcRItTRNqzhSfQrs6v7c84IFwsAnKsKZjnBFNfc5eX7XmoIqHvlQmYntU8BiHT7zekOr5Yu9Kgh+pe7hie2R7nZgH11yiini+vlbtAs/NDNb1Y7mq86XvAfYAio39M1pZ9VHWLANuKKuqXOlJ9JEvyw0Sy5WCvsg= 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+importer=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 1620041992820129.70409319704493; Mon, 3 May 2021 04:39:52 -0700 (PDT) Received: from localhost ([::1]:42622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldWvP-00054a-LR for importer@patchew.org; Mon, 03 May 2021 07:39:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43556) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldWqG-0008AT-53; Mon, 03 May 2021 07:34:24 -0400 Received: from mail-db8eur05on2096.outbound.protection.outlook.com ([40.107.20.96]:36951 helo=EUR05-DB8-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 1ldWqE-000054-9H; Mon, 03 May 2021 07:34:23 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1713.eurprd08.prod.outlook.com (2603:10a6:203:34::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.41; Mon, 3 May 2021 11:34:17 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4087.039; Mon, 3 May 2021 11:34:17 +0000 Received: from localhost.localdomain (185.215.60.251) by HE1PR05CA0255.eurprd05.prod.outlook.com (2603:10a6:3:fb::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.27 via Frontend Transport; Mon, 3 May 2021 11:34:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XUTWYXH3Et8g8ZAZBu6pMGCXdXbuWLb40Tk5ChgPsmWSWpi7P7Z2Gd82dljayxkBoAiZE4LYXIzmKdDDR1Iy7QiQExUxurUJ8EHtecMvq8/MESos0DNPQ5XH3GIFo+xcJbcNsSE2SslNzXkt0l/QBf+P15nSK47E2PvHKj/P3mAptEQg1Q6BC4azuJuWTl4EzNhSxkaKYNDeZCjwnwcqZKU5Xiy/peYZtmDyALKNFsueela5N3O8Sug97w8Nu8D88fiMpPMaPsooQQnnXvYMuvkc5R8gwofGayVxQ02KR+S/AXeMkgUlsfXanAteaDHY7iXe/z2pDj7R+jjh6RT69Q== 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=4cAEjoSj6guZuOB4/+LwW8DEDRGWWkcw8lDFFuIwXRc=; b=H6skpxuSAFajX8bf263cCd8SDYSPHtu9So1JBSX4Dyk4iPvOalZDzBMwv+r5HwlkzC7meyeJJ8K0TShZ+miuMWCb5P2VjhI/UD7xYWKJVoOPxMFZnuae87PPAIPpW8gah2TXDInmusPMzcv+iMC6DLqNyAl5rSkQ1DjzgpRDGC9/tg7Ut004IKRoL3wmG7qMPOEihgRwmnqsjr0k204LSCN86+l2+U4KCwB1Xt8wvCnMlBfsfAk/98eHS5TjZ79PKDMpo7n7zcxGtZUwIcTK8Zaww/Aj8iTT+mnJz7NGnfkFmZeuR5L6bta4sndVvkVWRgoBBcl+eNxzQTeE5RVAsw== 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=4cAEjoSj6guZuOB4/+LwW8DEDRGWWkcw8lDFFuIwXRc=; b=VC9O2CdQOMQYyg624RssaRt/xAc0U850PqEfr/oSuMh8TcNNYcSaiULexNT0965tBShudpuEaWWTgDxy3/Y4xXFCRLJCEN9BUvrlWnwMiM6FW30uJvQjqXji8Dcs/7VGYGKSZi0ect70+RUyg2/vQ3Ebre+a2sXbdK95pvzfO5c= 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, Peter Maydell Subject: [PATCH 1/6] block: fix leak of tran in bdrv_root_attach_child Date: Mon, 3 May 2021 14:33:57 +0300 Message-Id: <20210503113402.185852-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210503113402.185852-1-vsementsov@virtuozzo.com> References: <20210503113402.185852-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.251] X-ClientProxiedBy: HE1PR05CA0255.eurprd05.prod.outlook.com (2603:10a6:3:fb::31) 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: 1e88acc8-41db-4904-200f-08d90e27627d X-MS-TrafficTypeDiagnostic: AM5PR0801MB1713: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2512; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gWEz6S6Luby6NGloTiajLVSNaHzlZm1QF2Jf+s4PibDUDTiAbGWrcwjPsSPhxaI6/RaGYkeXEB5LgqxRoS7Mutwyl2eXivFQ2HRhK0cd7spsMnOgKpqdvh8d85//E9qsc2LHdmyv56D5spDJyEW1CHuYEbxhTO7urjqY5H47FgpGP0ZASxM5ZdL+S2M1/aL5SbiMXBc3NmDl7PgfX/kusTAqHdE2Omx5MgTDlX3LMebLuVw5I7LZitIXYtwUt14EarRe0M77Mnndi1E6CN5qnEQu4ZXQYuVEzEpE3bOYxrciG51oM2scX9psUadK9gf9kte5IGTQjGfTYjgpewrnICPAufU8DkOYra6Vg7VqK+mrytoySl5TUKkWuliTKywxxL0EESyPhKGWbMuUVckMkqgv437qbziVAy/jgO0CyMzUPb2PlxTaS62k89qbhluXeNc0BgxWSNQf4/NvDaN/1P336PUXyj9ioXDkNuok1E+RSDm2QmMR4ZYn2cnZzVHlGv2+4fV7VEOScLfwDz/LEj79FYHLHElf+Xr18hjzyZXKHuO15uxXotMidoKnVhyK7AmS7lbnS/feSPNX+Z/uZHGXwGQ3kNu+EDS3Z9Eb/RVobhhZkMqjglRI2wh4wWtwxEV3MQsaXycmShJeoz+exXL7ATKPp5FVMxPQmiI4fgyYbOCTqao6oY/4DosNj0UR 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)(136003)(366004)(376002)(39830400003)(346002)(396003)(5660300002)(6506007)(956004)(1076003)(2616005)(6916009)(6512007)(52116002)(4326008)(16526019)(2906002)(186003)(36756003)(38100700002)(83380400001)(66556008)(66946007)(66476007)(86362001)(6486002)(8676002)(8936002)(478600001)(26005)(6666004)(316002)(38350700002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?UJMvI/+iCZAqFgIDiXHllaSaFflzTWANZO2zRP1AjEqupuYzo17VED9W7W4G?= =?us-ascii?Q?SNuqWMhUkr0c78D/SywxSjOBhsXTghdgOZBSYbFBPdnJQAFv74z+jXL+rxjK?= =?us-ascii?Q?n4rNgxy9kilYVtXD4J8StTmcDDou/fPVkyBQdthn1LITnBkXvRyBnKWFL+2+?= =?us-ascii?Q?QB4TXCEYaYVrvsx0Qt3efqsaKY17DndCKa4NDYp61xfBEsFpESPyyjEiLogL?= =?us-ascii?Q?52vM+QEi7OWQQ65efNPcQMkKfr/9ZzPMXb2ibOFL3dy2Bb164Yftc+tkw+8I?= =?us-ascii?Q?jIluq2t+ExV28BygNbjfTBLC+rRHPL7o4O5O90NjIQVPEz09TaYzO829ZADd?= =?us-ascii?Q?uk1/MPAp4GCw2RDFzKo3PA+I+CwP5j6nVmEMxcVQKWiVO7XemOq1g4kJ2dsK?= =?us-ascii?Q?TcX5sVMjUuzuOmXfBpVIzfNAcUnXl/3MCcL5TDP6K8KtzQe2H1UG3MC5Tvb0?= =?us-ascii?Q?sOWhAcKJqxYdZ0sHXM8TKQ0Lo0fa/Fuu0y+UmbP/1VVL4IaM5xDYnZ15mhkp?= =?us-ascii?Q?RUB8Xd+o1SednxCVBgRldYOdlJpBmQV6DlQrZNTDPxXBld7dQJQ2J7KSnPBI?= =?us-ascii?Q?bmAvcpVGHjEEUF5B9ppN0iBjXR0a73IuL4OGBbeUgX1/iG35afYo9jLVZHYv?= =?us-ascii?Q?lm+UYkN6gm5AZduqDWy6Fxa9HU1IDKK8lkvl32qJBJQRgnQQpDposROoGCE0?= =?us-ascii?Q?j87etZvbvoIE+O/Quq2CdPbhlTm+7vbbPV8p3XeD+l9YVYZqMtLHB80jhXhI?= =?us-ascii?Q?9ZP/+e9nhwiCsC38P+0tc2u6Tjn8ysz8+oPtQ5nA1YNUt+YGJSIlTDQwDXpO?= =?us-ascii?Q?mxPCg6PzZWW+eaghucipXY/NVKkAQFNbNjc5ijJzejd81RaS4MP70LQ3lApY?= =?us-ascii?Q?I8ezwaWjb69ScTsLGcS95Fpi98QajaGp+KkkMpTY0ComSLBOHDJEexXqe5X0?= =?us-ascii?Q?H62br8RRoWTg+nCE/DDrVtEn3XEh5q/wSCSNnnfa1ELgN5m1s2FNGyYncnWp?= =?us-ascii?Q?r/bNJxW+l33TSADyu5NLJR23jp8Nx4P75sufyExi4vpCqeaMnMSLceP1UG7Z?= =?us-ascii?Q?Q/L7/r4QUa4j7iVuuNUX+Uv5F3rbwGPOJqz96kL5bmVaAh3NlhFlWDfO3Uep?= =?us-ascii?Q?mj5Xx0sTR6Y6yhlxV0UqvF3llOswfIuAKKRx5nIrHg5n3GzXpyDyR2vjLvLs?= =?us-ascii?Q?W6f4vHlv70Pf3Gqzp9gmXqUTseurM2tLGEkPkI/scvN5dTRRanX5vNkiGSpD?= =?us-ascii?Q?tNazymuuP9ZHRT4DWJaK+2JqP2iCDroEwJ9yshWqgbi2ouKttH4lfHjAvcht?= =?us-ascii?Q?7WIyxIpt3kG70knqysXD2grU?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e88acc8-41db-4904-200f-08d90e27627d X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2021 11:34:17.0029 (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: lF2OLeaIqzMhDn8qARelafF56ilQoP+qE1BFMMpQZSZWWGRr1yhQc5Ep9A8X9TGiGUk7LlVYJe34DuLrRZ40xlDfdIu6OeCQTAwmrp15eYA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1713 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=40.107.20.96; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" bdrv_attach_child_common() doesn't require tran_finalize() on failure (it does tran_add() only on success path). Still tran_new() must be paired with tran_finalize() anyway, at least to free empty Transaction object itself. So, refactor the function for clean finalization code, same on all paths. While being here, also leave a comment on unobvious background zeroing of child pointer on failure path. Reported-by: Coverity (CID 1452773) Reported-by: Peter Maydell Fixes: 548a74c0dbc858edd1a7ee3045b5f2fe710bd8b1 Signed-off-by: Vladimir Sementsov-Ogievskiy --- block.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 874c22c43e..728aa34b2f 100644 --- a/block.c +++ b/block.c @@ -2918,12 +2918,18 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState = *child_bs, child_role, perm, shared_perm, opaque, &child, tran, errp); if (ret < 0) { - bdrv_unref(child_bs); - return NULL; + goto out; } =20 ret =3D bdrv_refresh_perms(child_bs, errp); + if (ret < 0) { + goto out; + } + +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); return child; --=20 2.29.2 From nobody Fri Apr 19 10:32:49 2024 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; 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=1620041956; cv=pass; d=zohomail.com; s=zohoarc; b=PyDcf6NZ9yNjyeRpXJq+8sF3UCi8Fqv/8mkWuMnk4ngRPaBqvZdbXcXkYXwlx8sP4Nahi3jfTLWpFunAT9j6C3FRswkUTdzYFGsufmaW6XMq1T/3bzYlwG/ebY1KD1I4lb5EMSyCF1SvYbuQhGhDx8YwqeepbPGaMuy5Gogv6Hc= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620041956; 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=bXSYnboAysDqfIG3CiM3ME5AKy9pwoJBAJzNwZNLXZM=; b=UyX8/HpY77bzSgl5Dyow5VovLcKP/AKTSHDYlDJLXQIx6RkXM6YfITINs7+QcP5EdxADpiP9pf82R2fY/YJ2l5VzlgzQnOBAxMgxhF3RBw/XGgrdTc8rlhrjC84NBpfIYV+w74Qrr3GFK62YVjLmbUF9y+hWOOIi2Ttk9f4ihcU= 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+importer=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 1620041956130967.3393474992444; Mon, 3 May 2021 04:39:16 -0700 (PDT) Received: from localhost ([::1]:41564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldWuw-0004d2-5p for importer@patchew.org; Mon, 03 May 2021 07:39:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43596) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldWqI-0008GO-KS; Mon, 03 May 2021 07:34:26 -0400 Received: from mail-db8eur05on2096.outbound.protection.outlook.com ([40.107.20.96]:36951 helo=EUR05-DB8-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 1ldWqG-000054-RB; Mon, 03 May 2021 07:34:26 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1713.eurprd08.prod.outlook.com (2603:10a6:203:34::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.41; Mon, 3 May 2021 11:34:18 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4087.039; Mon, 3 May 2021 11:34:18 +0000 Received: from localhost.localdomain (185.215.60.251) by HE1PR05CA0255.eurprd05.prod.outlook.com (2603:10a6:3:fb::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.27 via Frontend Transport; Mon, 3 May 2021 11:34:17 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ThyOYQull4oKnwdn67fmZ1eapKvi1aZdkwSvcHHOflDengwGHeLZbVHOCtKdmwuPilD32j0DYGDnQUC8Ier6O3A16yFZtui40+sRBm5o0VNsXVgr1fGbaR3Og6hDzfNDtNb/7UXx3AdSkt4MvcwiqjVE8EyuYt+YpsssLjIV/d1kAsWO9yZNrxjjGFYzr+fl88zAvkkiK3WdOmGx8EUcvGfljST43mO75WjBoSomziv24PYAQZJEUV1z7e7nKfSz0UINk2/0tC375giI7TFGftRHRj+9doJIIyuC29Nmdx4U54Pwdk5c6kLVks6hh7VrjnNVwuRmEr1zJepWHVFr7Q== 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=bXSYnboAysDqfIG3CiM3ME5AKy9pwoJBAJzNwZNLXZM=; b=ftr8JdLVsdC5jWY3xG7Me44YO4g4k69YY4kSt1sK5yWZb66QnBdz41jroacv2CtCuznjIDvnLFbKBK6Xjig141raxD/AKVqD8t8T4vmgtGzH4WdygFSAps6EZcSNApSzBD3ZDxA0HwsyjcwE62cLRglIQ4o2FTxO7aJJzx1M+heA020lm1Y/PCAWJtd4DJzT62tLvl5WtffdLt64wEkNreqMHmiM/EpvX6rPTbNJAQma/gLlgcdVNQLGgxa2oVVSfG14uAAK5bS9vNLcSvy0P43U7lGOjHd+IgXSiAf1Gxo08aIb/RwiLVZvvE/YWW9h5AvGdi/vFrvhBAjLkAaOvQ== 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=bXSYnboAysDqfIG3CiM3ME5AKy9pwoJBAJzNwZNLXZM=; b=j8aswrSDi2QOzGyTGW0lriXiuEzhJfE2Q8qDSGgumNgxRw+rkcRPToqI4i1ktf8YXkjWBoDxpkyIrfqlhEAK8JBGqfJzlNfLIjVdq/H2PyqjCyyuBvWTqawE/S6Go5E6GG9jZTNS17/OofupaXQFJXJ+SJXIlhbacUqqHKoh+/Q= 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, Peter Maydell Subject: [PATCH 2/6] block: bdrv_reopen_multiple(): fix leak of tran object Date: Mon, 3 May 2021 14:33:58 +0300 Message-Id: <20210503113402.185852-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210503113402.185852-1-vsementsov@virtuozzo.com> References: <20210503113402.185852-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.251] X-ClientProxiedBy: HE1PR05CA0255.eurprd05.prod.outlook.com (2603:10a6:3:fb::31) 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: 4762189d-6ded-4312-6fc9-08d90e276308 X-MS-TrafficTypeDiagnostic: AM5PR0801MB1713: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xtZI5Acqzc2GtJmDgvSkU3Ez8R4r6yt3dAErWr68O27INvO0FmZoNg5LwdQS4ko4J1aXvcZNlsfPWGXzk26PcX48PLq/Hp+qGeCwN3A8GePFzAYdokEhIVNtG4qRfOzMUieySCarjfOOT5lvj6OJX5icFg3tU504XXz2/ynf3EWKnnj45xGQoBw6sCyUel19IiPjONMM6W5byuP7l939NYOsJGe3ZVlYxDwB6V3uhHcMMx87uQDqIWEIBpeRjmQ2OZ14hGaDVNyyf2F4/Oc1yjYKmcBfk4TnW9GesDlHouucCby8nMjMSWtcWLs+OFX27Bz6q0oTVhJ2GJ0hRyLDN+P+e+VKvtnT03bGEQz+hkzhTjF7/oUWMYk1Tatxg1lRpNJQpDkxRYCcsKRvkOHyd2cu3dSInjofqK3O/zB/X69pWDWGPApjcwrFlOzDjiNwZYSZPZwzXHPIi1OX+k1wlXW/STaVpF9d3um6h+Go90Wrny9vHwiGE5gWyDwPdCnyMV8qIWwPj/q1dUYVtiBunlRHKzYMm9Mtmy8wOIZQWqtals1Nl1kY71gzn1rE6LHVRIUmXC0NU/SrU0oRMtpW3v0jIVM9FiBIxzo25BYwY1DlL9k5AaT/qD+zO+gXvxIXSPqQcShof82ugYHtMY7KLvoerjmWNsx/6b3Ow96Lrxhens63FMwgMfNeEDx530w3 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)(136003)(366004)(376002)(39830400003)(346002)(396003)(5660300002)(6506007)(956004)(1076003)(2616005)(6916009)(6512007)(52116002)(4326008)(16526019)(2906002)(186003)(36756003)(38100700002)(83380400001)(66556008)(66946007)(66476007)(86362001)(6486002)(8676002)(8936002)(478600001)(26005)(6666004)(316002)(38350700002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?McFJXC/rlPWnW7uga7ohkW8j0wPmfHMOG62k3oXOLglCXcKuJXCtQiSCV419?= =?us-ascii?Q?GW20EDTQcDxq8wfp9g4wNYU6RSxIt4q/5Ji/Bauxbsd1sD7CpuGwXSeS/YjN?= =?us-ascii?Q?6cXo0kyMBYpzzMpZIEy7mdUVtp8PLgcqX3r2Nqfu+gW3PcSMycIr6734UtX3?= =?us-ascii?Q?lo9xGHXLoucHBQp3DD2dSVFOkc+5MVOEWCcaQT/80pBLZ+l5HdUZdzkzHcwa?= =?us-ascii?Q?sMPsygoKhcO85EUoG5ohZn0v7bBytbNRtcuT6I/KwFGWINYe9Yf5wyeq0RP+?= =?us-ascii?Q?7G+2EHs8AqnIgGIYgwspD0CahhHzBZU8FfcnzZO3oTuT7JYaHDj7BsRZI3F1?= =?us-ascii?Q?F6ynlaTp6hzOxHl6v2Wp/qP+LslZvIpnufksR3dCEHcG4BtBaMBMlb4Cab7+?= =?us-ascii?Q?9VKkZBoOfqpmcnlXCVYelAJ1hUVVWJprgqHrtyH8Kiq22cRHDU1FWl3Y2y/C?= =?us-ascii?Q?9SIQLsCDHhnr//JlUA51mvB7hV5PxBogri9r4HLrKbQqeF6udK79qZJf1tfU?= =?us-ascii?Q?miNszySGu1QRJPAC4pseURb725OVjHzaEE+hGF6gKaUzdAGtA2X/uNiiflio?= =?us-ascii?Q?y6gn4cdnhniyc22g1NV3y6B7wYvJE2YZnul4coujf9pbvgk4OCesRBosLXXm?= =?us-ascii?Q?w9qxcL/sFL8dLvaLkuqPB4dwU8UpElM3MCOdgwPfsn1ZdXtN8Er32AQpYHrM?= =?us-ascii?Q?98sY9i9g0XVaJ0KIrVWKUL4uwNiJub3S7Rdr977B48xQc7JCs/3Vxl1GBkuS?= =?us-ascii?Q?q4L7fg5z5UObC5Aib/8ul2gjVDHwOCXGDwHfzyhHoQ/X39XSnZdXvPD1t70A?= =?us-ascii?Q?c92zazZQj2BRTMjJ9gdfZGWUb1UACrLQWEiWyHNwKurVd1lxl0am5EWSekPf?= =?us-ascii?Q?gkn+/l8DKZdc/sIq2Fxn+BZiZwQWe2BrbegP1WTvk830GcPkW/97VpOArWor?= =?us-ascii?Q?sKv3artxq1JIeIgOV1CfMv8jPTlTAa1ukhZCrscrEUkMruPQJypwnWiWm73B?= =?us-ascii?Q?v0+0wDTSCHpJcEyj4bwf8QQNu6gxXfNe9QaYDTCzaiUrY6TKFwmupU0o9qlG?= =?us-ascii?Q?J/R4qN8HzgqkKsvKon0xEmy7HHLVU6Nx+Ba5bVaZM/6M/VZ9hT8s82Ue3J4i?= =?us-ascii?Q?JxwxlccWnLt3kTzuQGBbd8QQ4/85Si04/JYBXTGBfCOQfxCIgbr8VrPqyP28?= =?us-ascii?Q?R3j8fwRAFu3aH83Hmo8lyIn3t1aZejKdwhVR+aO5VwbqLncN5fIKimBc9KJh?= =?us-ascii?Q?L+BWNIT2D/pSUCgPGeq85pE9oZLDv71PESwfjTwC1Xbb/587R+OReYeLyUam?= =?us-ascii?Q?t3fJ1l1GTvb4WxmmPy/hstU0?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4762189d-6ded-4312-6fc9-08d90e276308 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2021 11:34:17.9229 (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: 34WLjYlxEacjPSWS4jhodnWcTxUorzQ5gP5vzPa5V0LPQFdnkueuw5ZYTCBqCC83lNebV0EvHRR38J/ZAafdjNT/A5Hq6Q456nutH8a0W58= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1713 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=40.107.20.96; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" We have one path, where tran object is created, but we don't touch and don't free it in any way: "goto cleanup" in first loop with calls to bdrv_flush(). Fix it simply moving tran_new() call below that loop. Reported-by: Coverity (CID 1452772) Reported-by: Peter Maydell Suggested-by: Peter Maydell Fixes: 72373e40fbc7e4218061a8211384db362d3e7348 Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Alberto Garcia --- block.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index 728aa34b2f..c4023ab4f4 100644 --- a/block.c +++ b/block.c @@ -4047,7 +4047,7 @@ int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, = Error **errp) { int ret =3D -1; BlockReopenQueueEntry *bs_entry, *next; - Transaction *tran =3D tran_new(); + Transaction *tran; g_autoptr(GHashTable) found =3D NULL; g_autoptr(GSList) refresh_list =3D NULL; =20 @@ -4061,6 +4061,8 @@ int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, = Error **errp) } } =20 + tran =3D tran_new(); + QTAILQ_FOREACH(bs_entry, bs_queue, entry) { assert(bs_entry->state.bs->quiesce_counter > 0); ret =3D bdrv_reopen_prepare(&bs_entry->state, bs_queue, tran, errp= ); --=20 2.29.2 From nobody Fri Apr 19 10:32:49 2024 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; 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=1620042254; cv=pass; d=zohomail.com; s=zohoarc; b=ULEFwduzJXHjW3MPgu1Bpj8+mM8EEwKbHkwuQZFksnTkZZ2dk5UhlfUF7SwSAwuKK3f9H9p9tdExJaK6Vu8xzRT94HcChzql3ICkob+vhMyX27yDtHKajR3su8/V58LckNbx81tbZhjSkqL6EPbdUb2Klh2nFBaYvvV4+Oi6hrY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620042254; 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=mNLEK2UMFxhDvPu4OGsI8kMBYCx4x7REl4afS56K2no=; b=HvM9+MRxLqcXnUcHlpOXJ05ukxVnE0gf2vg6UFb9SBQlov/8u/ir14mLZt4GHExhbipHODPJHdyI1l4RULcXVCbpOnNXQAnhuNcU8tDONc2AL0E0sgQaN0c/j6h1FdUPqv5dcqIQxkqdXAIY0GRitoRLaHlRp/NPEcd0X7+xe/Q= 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+importer=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 1620042254829903.3755409492829; Mon, 3 May 2021 04:44:14 -0700 (PDT) Received: from localhost ([::1]:49178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldWzl-00085M-Oy for importer@patchew.org; Mon, 03 May 2021 07:44:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldWqL-0008Mm-7i; Mon, 03 May 2021 07:34:29 -0400 Received: from mail-db8eur05on2096.outbound.protection.outlook.com ([40.107.20.96]:36951 helo=EUR05-DB8-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 1ldWqJ-000054-Bg; Mon, 03 May 2021 07:34:29 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1713.eurprd08.prod.outlook.com (2603:10a6:203:34::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.41; Mon, 3 May 2021 11:34:18 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4087.039; Mon, 3 May 2021 11:34:18 +0000 Received: from localhost.localdomain (185.215.60.251) by HE1PR05CA0255.eurprd05.prod.outlook.com (2603:10a6:3:fb::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.27 via Frontend Transport; Mon, 3 May 2021 11:34:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mgZVBk1YDFvRHFV2sw5k6ZNKsHBhJijxIBS75fk+1A+v7GzFfH83cTGgO1C2DDij5moROdmWdJfMGkQk0Vb0gHNvlagdp1FsSg+94s5ouXEXMN0Nzj/gAW/Jm0HVi3iXpV7QsnHFD3V6tjRXYuC+IoBc6DXpSO2w7s3B9cY9gbNKb3NvSqzq7olE68Y5LJRcd0lOogADjwSu1R2Te36zDZPF6PIMx9c8jQgTW7Jvu0clNPNv7CYHBZEBzDl5L8S0Uz4MIQhTpS5bj/XPgVTXW2WhF6vOsNeDVOGEJf36G2fY27QSfRJaHbhc9u8b3bAk9xU1tZqxU3aojLmgQui9RQ== 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=mNLEK2UMFxhDvPu4OGsI8kMBYCx4x7REl4afS56K2no=; b=AlU3Cp8EpJ7gCTVI+zML1QU3Xjdro+BupKprBGWrcmJwlVVDsN5rTG/zKbtqDmdoUjnLHC3SsflxaAr/we6+L0ntmCuwI6hDdj2Bj/LpPthZtrF+pmQDWfhPMH73qcHBtDp/j/28cwli3jfYKsOogi+Rgbq7nOwIoxsLtWH9aRLnaeMnOH2zqtpxQMyG2mvAsy2Qz64eF5P7CX+5NmqgnecX9xXt12WlQI5KqvpU2zZLqyeQu6eS2k4IqCuzLQhsmKkYIaUM8D/IIn+gni2RgzjwyLM7RdRoEchfNTpAmy2Ch2ERvFoFHWDmeMvo17QHfDGQjwfxhwdH9KohgDfgCw== 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=mNLEK2UMFxhDvPu4OGsI8kMBYCx4x7REl4afS56K2no=; b=jcDdRDlFgCICHUNqjmdnboGFy2Sbp4M8D7qg3wR7O6DZMZ1LBpgbhiD63Z6wHub3N84aLxcLTYIFvKpdnbT81c1uiKJ4W1jeLs5fWjmtU8ZSdYJLAsjRHYPlmGLBUVWtuFzMfU8Yk6I7V+VJZyq3V7gXGGQbE5DCJ8gkxLRUAvw= 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 3/6] block-backend: improve blk_root_get_parent_desc() Date: Mon, 3 May 2021 14:33:59 +0300 Message-Id: <20210503113402.185852-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210503113402.185852-1-vsementsov@virtuozzo.com> References: <20210503113402.185852-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.251] X-ClientProxiedBy: HE1PR05CA0255.eurprd05.prod.outlook.com (2603:10a6:3:fb::31) 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: ec87e897-91d1-4190-0669-08d90e27638a X-MS-TrafficTypeDiagnostic: AM5PR0801MB1713: 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: mL8hBpV63WhusOU3ivaQ0ZT7dkEAevbWjGUk2CicMxw/MaDb922ZRHw6ciHhGQ2IMxKKISQ5nbw4XfvPZ98JLEwoLe2AEilane8vqFikxmsNBfMGuesDIx646BzIEtHkTbDdUJBRxjCcx6KZm5MudpS5eMcKS9AjTIQhquZVk0EiwYG2xZKUSm+2Me8W6bZo/AG8vEV/B3ZERgxk+7Le6pfkLI+duB8iTFMEaQaxYeFKZMuHYtvuXjmGrBy9nkcL0pnl7qgMVqqr4X0qxUhoStVCJOuPV006SMhdzg5CHDkrosnyEA89Pplyv0NLfc4kogkAkCmtbNPVn7kzo2v4niabjC0xq/XDAWzdHP6XaiR1+cyx7hdXBpecYe7T89bjhRzauz4NPKI5oe6VkjlLzABHQ1ADkKyg6rxJaojOWCpmKu73B34adcxAcJSTr63s8/VjYRhiB5WtcY9Th+b3zomkrLIVZD7K42gP3ZCCxsjqxcEEhc6OU19Y57mnZ+pTsPT1YXaSHrKuWof12L+wv3jTjP3l/BghAyrSgp11X9TZBForyce2JHzZxosucgLtLx5b+kuQQZzfCURJrJwz6uyoIPHfhSrnNDwysYAV80T48zpGovD1LT2lbBcue1/2Mq/DbGC9ilfMsSrRbGS3oi3GYN9jFFrt2KwzHBLq+/V7O5wdrEDDlFxDSZ1zQnYc 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)(136003)(366004)(376002)(39830400003)(346002)(396003)(107886003)(5660300002)(6506007)(956004)(1076003)(2616005)(6916009)(6512007)(52116002)(4326008)(16526019)(2906002)(186003)(36756003)(38100700002)(83380400001)(66556008)(66946007)(66476007)(86362001)(6486002)(8676002)(8936002)(478600001)(26005)(6666004)(316002)(38350700002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?nsqri4pQw3I/3lm3Lr5WfGaSVNAvABRgE10cyMUUIQNo0PoAYZeJCT3FmKrf?= =?us-ascii?Q?bZQTbspj927izQZWk/gOeunE3hMIK3dw/zTMuJppJ5+cSZKf0HtV/9k5fbwv?= =?us-ascii?Q?nZv01mcNvjDu6TX17J8seYC5qv1Ev5XGrTBC1SVm1GSgKBfmHmFJb/bjyqwU?= =?us-ascii?Q?4+vz+9jPvNYA8SToGS1a0LP30kV2L9sPq1PTDdKMMB8tSlXRKr23uLvlYoKU?= =?us-ascii?Q?CUk5IPBUw8W3PRFeoR48Gujr97cFCtnBWITK8cFVGKrrF1mv5FU6neP2BHAb?= =?us-ascii?Q?puHHnuLrY1atA3W99rder+w5AT/zmojdtAS3O4sSjNajg9zYy69pCR2IyNbp?= =?us-ascii?Q?jiGnMTzz9o39ou7u9QhnSOsNsoz++N6V6IKt8h2/eZb/s1Aq5/Neu7fb+iD7?= =?us-ascii?Q?wRk4qWOrS2UBgwjHT9cZVAIakuVCmuP38NP1U0dS2YP8hrYD3Oo9axwj+F2w?= =?us-ascii?Q?j0jv5SXJVzQAp2bEpOzusiEhpydA9YGx3NyIpux3Lf3Vf5H0CTwO38CQyXox?= =?us-ascii?Q?aDntSoK+Xzb/hMEPAg+xysDgJk8Lb32POeMN+t+vFAhXvrByfwMDMJ+PDeqY?= =?us-ascii?Q?TxsTk3+/6ysETNQ3qR1Ha0hNBqUqnNMwAeuqrhNMKfLhHXUZb2tbahfRJKBe?= =?us-ascii?Q?ee6K6TG+2npkNZ83Tp/7/FuR7Fmct4SG/8VPRKKEeA3+BEfYDUQny4qnrem3?= =?us-ascii?Q?FIhd2a8AP1S6J4i/dHNeAYB5Yc+tFkpej1mVZHvjxqKiuX0qVRfLnrVc0Q7c?= =?us-ascii?Q?+uOqY6hAbN6Jpz4rocX09+tKqcNa8sofqM/1WeRk1WxKQfo5aKAdrihmbEZI?= =?us-ascii?Q?5YJWkBOPQ32NoQdup8knM40cRcpsxPcy2IFtrx0T0ZAxv7oFe/Bgfzh0w8Bl?= =?us-ascii?Q?+HKz5NTDzPI6g6XoQPn2uYNiy3sGji4+O7L20AkiBEAq7VL9TczFIuNWyYKm?= =?us-ascii?Q?QzZMGdT24d6l1cvgy64cQ8lZOcqca0+8QPTYvZwB6zfm/0fAgRCEUIPBoOtV?= =?us-ascii?Q?4b7H7ygbhLqg7B7HtApBc1+eCcCJOUAkqfc9FWHi7TERBL7H23h1XVEEd6gK?= =?us-ascii?Q?aLUa4M+fcYTYKSAx3VT/0FPuarok4b37gHlHGmU87zvTr9wgq6dpTLyQbR7G?= =?us-ascii?Q?7sdY1qJBj0EYmnj27WG0dZW+VP13I4ouqFEOGKSWw9vpFzL27oOEbjtc9cMq?= =?us-ascii?Q?iVtIP1kbHlh3aDcjwxLgb97dTthCH0/Nq8DNik3fskl0WlnfzuzosBuFHdkF?= =?us-ascii?Q?5QXc0tvAZKmpRUB/lvsckqm+Hjc+kpGAGcEO8ZaYXLHWrZdZvA+GDdh3QqsC?= =?us-ascii?Q?zLIKQceKBlVYl6HNNq+1YpKk?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec87e897-91d1-4190-0669-08d90e27638a X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2021 11:34:18.8279 (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: R80bYTb9f/zJkJFRm+zoG2RJBvKt/Fb4MHzxjSeXtXtmgjAG3Nuakn5za7pP60Zfr93XCAt9sFhT23fptaTDwhELLWnehQOgRy7Z+pxefSc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1713 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=40.107.20.96; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-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+importer=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 6fca9853e1..2b7e9b5192 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -142,19 +142,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("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 Apr 19 10:32:49 2024 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; 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=1620042419; cv=pass; d=zohomail.com; s=zohoarc; b=fXVsUJiL9XuGpIj8hSoQaeYIk2eMNo0HP40X4N8wQdM5zn6JmzRODqTAS27ltwSvXfr0Kc7iShlfGXqSKaxt8QXtYX9pOQV9VvUT6mV83goOq2hmgHs9P7ngX8ylR2yjpS5+M0WGJIHC+H57y9u4mFE2VcuQQ0Bc+IKqWGBffZ0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620042419; 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=QK9vVa+K8cAS1MJK6V2WdLwD4F30KMQ2bmnDznMSRVQ=; b=k5nxb06wiCfvL12XmUB6ad4gIc/OwQMvZ/F6i4UHGrcAMLYewBGoKBDBwHEr9S4LnqqQrwiKSnx3HzrISirQDlAGxZiYipPTDLPv4MJa8YACyw6Xia0JFO/Y/z1YtqaPyOGPG5tv8jEqGRpCgsIIFs5eiTgE1Nv9iQRvzEmzkk0= 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+importer=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 1620042419662890.7229925339751; Mon, 3 May 2021 04:46:59 -0700 (PDT) Received: from localhost ([::1]:55836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldX2Q-0002ZX-Jl for importer@patchew.org; Mon, 03 May 2021 07:46:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43650) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldWqN-0008Sd-PO; Mon, 03 May 2021 07:34:31 -0400 Received: from mail-db8eur05on2096.outbound.protection.outlook.com ([40.107.20.96]:36951 helo=EUR05-DB8-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 1ldWqL-000054-TJ; Mon, 03 May 2021 07:34:31 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1713.eurprd08.prod.outlook.com (2603:10a6:203:34::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.41; Mon, 3 May 2021 11:34:19 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4087.039; Mon, 3 May 2021 11:34:19 +0000 Received: from localhost.localdomain (185.215.60.251) by HE1PR05CA0255.eurprd05.prod.outlook.com (2603:10a6:3:fb::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.27 via Frontend Transport; Mon, 3 May 2021 11:34:19 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SdWtT1Y6CguRgJ5bqUZ5VWfiB1E0MfyMnauQ1THqyt1n7n7XGY/HTK9o5Dhu+J9uwZZcxI5RFXecGImcSD2DrJPQg1vSxhqQPh6aYDWc3fJ7+OuCQrxU1wciTEf/DSYWAMoKNjA2RVLZ0h90AicjMtLLWHgRoRElubdXIcIEBPfFyBC8EtWkGvh6xZbiSTCvcx3DGSFekg8sLy43tJ/eKmKXkKBr9lCbi90H/3pTvVXeBYN4iY1wmcVkkXvaxCUkaoqIfuFWt0Ls2VJB+PJg4NlDvNx42JvMi1w8uSFnvi7FfaXIKEfZNdpu3c+AN8M8gu4YNEYIZ0JY9sdod0dZSg== 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=QK9vVa+K8cAS1MJK6V2WdLwD4F30KMQ2bmnDznMSRVQ=; b=Ov5qyvm9unvCxDCPIvwL3NaacjxV/nkfedJuPsrVp8G+oSXiyHJOeDttLSkFgvv9l04NWLlipf3k/7imcpBAZtSbJXGvEsxpMjnVxfVgvCenIcN8wj8jpI0iD9nJ18egCjwLOs2iQuqUN8ExFxG2JhAd8zpcrpy9wDuhs+n6hj9z2OhTgMnzhGyRtnoC/BhZyF9A1uEiisVtxkSVa0DQb5yd7yfjeG2q65AOlUy3DjcJUFkdw8oVuu1uvHGzWBwr4hN3G1JhQB87qqhvXiHnRJTrMA0RqUEhzeUFdopCTOGorIuH75Gu+7uuDkaYM4yRT5NbN+63JC/Fvt8WAbIieA== 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=QK9vVa+K8cAS1MJK6V2WdLwD4F30KMQ2bmnDznMSRVQ=; b=QDCkhAwjP4NhVOEZk1ypVRDPGxXizRsjgHSfkVwErKUj55kXfrRWTKtSnQdxPx0bcoxfVzjfCyaCb85Amgb1Ey6/5K46kYCTlU6RQQx+06nrR5dK61VUFqWxVmsHdWG2DwytQy9yxcw9WsDWJP+fRlZF/uO/wnY+J3qciiE2cRo= 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 4/6] block: improve bdrv_child_get_parent_desc() Date: Mon, 3 May 2021 14:34:00 +0300 Message-Id: <20210503113402.185852-5-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210503113402.185852-1-vsementsov@virtuozzo.com> References: <20210503113402.185852-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.251] X-ClientProxiedBy: HE1PR05CA0255.eurprd05.prod.outlook.com (2603:10a6:3:fb::31) 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: 47014a6d-f3e0-40a3-a3ee-08d90e276415 X-MS-TrafficTypeDiagnostic: AM5PR0801MB1713: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:469; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j71cRbjD91aauYt55tXZYXJG1PxEJOBhnaIdZ4/ughFGHPx7dKHSwQ/A0SklstXevDLG/ybNSkRPP4dUgwelkHi0ppteMtpkeiLT9fFLWSRchtx4U0UxYZL39MHighcruTwO8S7NDE9r8Z2xD7/uwldY9Lk0ITQQMedRy/oFX35nd+cMciRAM4zEXFilIb6Kl16v8vuy6FWxrzPBfwkmO05vXh700odww3iXMtak61Tu2SsxfWlNE7DnFgJVatnaUHdKGPqFi5Ofeejb2Trh1yBjUIeuXMP5Bas6yYuCklHYAzQybp/3PWfyUpffYfnLDMefTy13Gi2PnlkKvSPtGWbt99toeHcnVuG6Gd8VPvuTxdsyKKptL0eVu/P9KbeI4IH2uIrg4sHclPaG2DF+0Mq+xmsU6j24+D6bNl9EC9sBNwWigCrsliJJMp7I47QcF9A3NLAphwg/vfIcovLmntmnjEn2MhCXdFoa5x46bPtEVMIPCcp/ewwcxDKpJAjijRph24jruAia2QXPYqq0e3yjeV1cmveuCYcGIxxK/S9tffRZZp9i0bhtTSVcI8a3NQnYwe/YsYL7ErmbhyymGrUjRupyPjBqQwDDrqhv1XY+jUPf2bk+EcDNwPHQVYxWW3n9xVv8Iy6m3Wy13vCaGljvHfXbT7cA7Y5fWbtd0WVjUSuz8AN+mO9lNGKI2Xpk 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)(136003)(366004)(376002)(39830400003)(346002)(396003)(107886003)(5660300002)(6506007)(956004)(1076003)(2616005)(6916009)(6512007)(52116002)(4326008)(16526019)(2906002)(186003)(36756003)(38100700002)(83380400001)(66556008)(66946007)(66476007)(86362001)(6486002)(8676002)(8936002)(478600001)(26005)(6666004)(316002)(38350700002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?o76XH44xRtnQWIh3A+FLpbB+0l+NcjF5VD7IBQvuOMxUieOOHHFad6q+qHHr?= =?us-ascii?Q?AaTHUji76QS9zWtVTNtksqrcSPSqWQJLFimYeI3hyOa3+vUgKIB825wmsyvA?= =?us-ascii?Q?iKl+Qi3xPcx3YQ5yBXwpmcvOlhS7/kcjJ9TurgMTpeGxtD0S0OLwCuxTN6Yi?= =?us-ascii?Q?wB0oTmR/VTAF0JyxhWrnlWgBGEvX/JNUT2ATo1W0icICMw0W6Ya8LQz3HE4N?= =?us-ascii?Q?IR3HKDptXaUbGsyk3BdEKgMdXkROit9M1EUViE2FHrJ8F0RlbVhqA11CGfmA?= =?us-ascii?Q?A/7k7PGcH+DqhHrQ9emGHCp5MTZtnF11A8gpZ1DAcZtuGUsjjOfxu/8PVdnD?= =?us-ascii?Q?ncY+5dgT+oOCx0vTDQKXlqfvACdacGI+T1wyzqNu+fnY9Znj78xpiz2vIaTy?= =?us-ascii?Q?R1DaDOZzUMoUsSeYrP+UmWlgL3ii1EYelwQLcaJSzWPI+srMkRoWUrdR3UL3?= =?us-ascii?Q?mLtwna76AXMUxF+9gEGBH5hMMcisIhwYUMj1QSD/7ly6sTezxKyIJOBAZxKo?= =?us-ascii?Q?68ABF/zKph5eAQogN6a1LuQNXSC5aLSFH4T9Jm+ZcSpNa2+qhu++tFa8hy6i?= =?us-ascii?Q?CQw/wR3YYWcYGs65c4EDpHUdYcXKxJUU5m4rK0bzhHSD/EA5LNnOt7lkAutS?= =?us-ascii?Q?dWwVE6SxR0FS1EADdHWzhx+rgxleE6KBjwTcU/9sjio3HcuHozzLpHCg6y7s?= =?us-ascii?Q?JXso+T/rExsOX48qdDa2eoC/zhgl8RaqUBZIkg+A5S2Ur1/v5ywsRsPYjJLu?= =?us-ascii?Q?eklyQPuq4NSot/e31yQSM5n/Gjd1yJV0fUgkFDKK716Ey1Y1zIfK30L2ToEC?= =?us-ascii?Q?3ZzrOt5t/NZyCbfIxhMMGkBqDSXv4/pAAb/eD2AFirrD3pwV2WvccMMczbgU?= =?us-ascii?Q?FsHIT9seA9ZOjE3FeDLMvq0wdd3RYoNt1uKhXd3PO8TmP1LpklcRPSQBibdG?= =?us-ascii?Q?0sKq2eMl+17qQY5T+YMuYoGMYIvYiBuJXNiEpTm3a5b4EF60sRiV8TTEG10H?= =?us-ascii?Q?d69Ywzge27TiJT/dBP7wO8c9fFbRTJ05/wIUjYbPqevgE/flkXRrvPA6+3AF?= =?us-ascii?Q?BqlxxpG8A9FCxGlftmPdUoNZ+r5HfmKDHBXJI5Lx7v0ekEoOUuqUQJPu0KjG?= =?us-ascii?Q?WhceBHxrZ6zzlOsWvPpbWQ/a8/WsxQaChC/Vxu31GdQtecz+xrBxqGXrTgJI?= =?us-ascii?Q?em0RjWdN9gbmW/44+KnZePWKJeGmmbqiB+yANzuEDPQWbYPz/f1sm4GXc2/D?= =?us-ascii?Q?Lx5rEDShUdIw23GeoHWsMHjfUovbXOR2uXdjPxYC84nCTWhd2cM62Ad2A5by?= =?us-ascii?Q?y7QxXBcAZXam9TTBddwlhLM7?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 47014a6d-f3e0-40a3-a3ee-08d90e276415 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2021 11:34:19.6643 (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: vW/Hesgaapa//IUrMwoBDBV4V71ZHiXDm4T7bDj6gTnAAaIDrBLemjR9jjz1n0p1PfNl9pkbSUnkGxHdDLQ2lSpw4XqSz9w30+sE4BiE0R4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1713 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=40.107.20.96; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-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+importer=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. iotest 283 output is updated. Signed-off-by: Vladimir Sementsov-Ogievskiy --- 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 c4023ab4f4..1de2365843 100644 --- a/block.c +++ b/block.c @@ -1160,7 +1160,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 Apr 19 10:32:49 2024 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; 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=1620042562; cv=pass; d=zohomail.com; s=zohoarc; b=f/gMMaeN3APLYreyNs2uqVAk6j7F4c2F23KQVUT41wAzgO3QgmoKcq+lclMahFjxVp+cSN4Y4bLAM1f/AHKpkTw/JTJsEVIhs1kZGob+wFfSNiUc9f9Cu9rVJz3NiDg+eSzE8Vjfrgq/Zll0PHFM2R31w/oUaDB4MAESa2Y+5ro= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620042562; 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=5jMGYuXvnUMFwLuZnSGolYql//koQ97rDvTpYyVWDtA=; b=I3lwt4i6vdoZyz6hY8sJQ8qO5F1/I9cXGREOnl7ear4m0qWsIfmUN7JajtfSG9pq/VspaOrW4oKr3V607eLVtuLnskTxDJqk4zBL41Pdax74st/f99ef/IyDw0VCgw3j/fzwWUnzr8JS29Tp8o89GAQS75ykuNaFLumZMukAJk8= 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+importer=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 1620042562668648.0823764799935; Mon, 3 May 2021 04:49:22 -0700 (PDT) Received: from localhost ([::1]:60706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldX4j-0004gt-C6 for importer@patchew.org; Mon, 03 May 2021 07:49:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldWqQ-00008U-5a; Mon, 03 May 2021 07:34:34 -0400 Received: from mail-db8eur05on2096.outbound.protection.outlook.com ([40.107.20.96]:36951 helo=EUR05-DB8-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 1ldWqO-000054-ED; Mon, 03 May 2021 07:34:33 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1713.eurprd08.prod.outlook.com (2603:10a6:203:34::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.41; Mon, 3 May 2021 11:34:20 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4087.039; Mon, 3 May 2021 11:34:20 +0000 Received: from localhost.localdomain (185.215.60.251) by HE1PR05CA0255.eurprd05.prod.outlook.com (2603:10a6:3:fb::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.27 via Frontend Transport; Mon, 3 May 2021 11:34:19 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b4S0xY0AUmmSAbZ5YTiG5rZwa7HtVuAF9BS0Wb2hQFmdGcQ27koenkx8j2jh9GPpjChQs1KrziUIanxo/tnpTeE+w+Bu5udERrUgN8FR5gOqB2jjxAwkhcMZCiL2LzYOMnM5YXeqR06JhlPWv5eA5s6GdFhmsK4WWMQTeKrcoGyega2KMVma4t1VV7eWiRpC4CiCMdc1e930YWMwd7t8yIjV6z9/q7RhCNEQNADvzo54v+xB2ai6GJ3BPw91S2pVTmMgRC33NYuoJEhXqY3fDRuHORpXX6N3wrNvT9h2gHl2SYsKFGugTHp9BsVd3ezyLu5n6OmIymBaTSDtMGhe8g== 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=5jMGYuXvnUMFwLuZnSGolYql//koQ97rDvTpYyVWDtA=; b=VPkSwQqE9Ur2fkjaIs06vhMFG6HrBnXRieZizSTavAZTYiGHp9lAwuXnNHVSFSsXN5NP9ONUgRk9Yq71x/3hwRDCZMnNOJmxg6b4v7D7ifIkO6CUigVq+ht6MglpcqmqconuDsg99n5lQQTsLnngSAYdBIgsB7Lo8xL7bhPKVAHexY4icLqoIHgCTVAsRufLQkCfnDKZ4G6JbbmpIZxNwbQNjmAp2BLCIF4uRxsEcFttWZJPgWZyDPOLX95Uam6+bi6Fq29c7iGWUBcwPdYdXjT0ICma0gVNCy5XlN3KO9yqEOOZF2StmMAQwImONLOxK937DZhKe9xHNlZcjWqRNw== 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=5jMGYuXvnUMFwLuZnSGolYql//koQ97rDvTpYyVWDtA=; b=SbH3cKiS063OoCVYig7uclMWBfuvCT7wB8zorq4Ae5/mPjoZvemX1i79Ji8Usw77vVc6D3Qcj58R9ky0c5FxZ3GdKJY6KzZS9ByYZnFwXAuyUzLAZysyaTvVUmq7aiXq9RyoDKWKIceVqzFiwU+eBCiSFK/XL7NOeJAHkrCNBlc= 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 5/6] block: simplify bdrv_child_user_desc() Date: Mon, 3 May 2021 14:34:01 +0300 Message-Id: <20210503113402.185852-6-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210503113402.185852-1-vsementsov@virtuozzo.com> References: <20210503113402.185852-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.251] X-ClientProxiedBy: HE1PR05CA0255.eurprd05.prod.outlook.com (2603:10a6:3:fb::31) 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: db188f0a-e5d6-48a4-13b6-08d90e276497 X-MS-TrafficTypeDiagnostic: AM5PR0801MB1713: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:238; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n5sb8lEBZJfJ141ucoANb5LgMgDoXe26vST4puMI4qwBlEFuKlTudUEnBNUlxN7arsFQI0dI5YIwE66wDU+nO6kAxowCJJJbgEmWFvh3ZsrXtr255wTEjFj8qePamIlHuRTuv7fYTZFuzOPQULTKvzuj7LokE9GlAPoWKqujpS01jIxIksORqpbYohLAlgKBgLMtu6MfHTUwaiGBnH70zGmezO9TcVbtJockS8lIeZAHqIcZUdhU0YJVK9/5bDm/9bUXCmDnMn403+9Fn6bgb5hEoA7Ypm+/AtUiGhbIYBi83+XIgYcosX9hqM09iLw2qckjCrz+fph/JAKtCz59PKU7TMOz0bfj6JjGa966IPAAGksbkFkeJwWhg2uL9F2aGZLvoHqSsvbOXEUTSNd3VbOKxvQBNGwLMXv+yfHokbCt6APTg6bI1ldzUjPe0Wg1hVxxc++j4xQBINNQb6flpLC2/d6Hbi09T5OcHIIKVKgkQqmgScANwr5bHi2h2hlrmd76My8xrl1TzSYbrikHgJVTJw6QPpaFtP/m1Tu+IylKNeklQs/tjm+3hSEt11hzTv0RjT/FGvu4uBNXtiuya2CUfaKJvOlfGn8f0wGvC1iYhblhEytsGnqa/roAuCPoUzGI742azwU3hRn/cEgrGZePJfidqgRhRsb30fTug8ipBD/p0w0uc7hppFeEQa25 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)(136003)(366004)(376002)(39830400003)(346002)(396003)(107886003)(5660300002)(6506007)(956004)(1076003)(2616005)(6916009)(4744005)(6512007)(52116002)(4326008)(16526019)(2906002)(186003)(36756003)(38100700002)(83380400001)(66556008)(66946007)(66476007)(86362001)(6486002)(8676002)(8936002)(478600001)(26005)(6666004)(316002)(38350700002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?I884Y6X+GuWbqdM0MWbw7AqUfQQIu9rPDzXY1ML1WTYmnTG3+9wryQdGJlUk?= =?us-ascii?Q?Zk+csozAEHUIwYndOq/YDLW3RXQHfSzMdFxabUMDBr7Gh4zxKn2C8R10D9HX?= =?us-ascii?Q?J3GOz0m6dv3y0CyCS42T6HCY3fFzRQx+M3Sr7Ol1puh1JPdCBQQ95p5xATL9?= =?us-ascii?Q?IIlMC5si75ounNqUO7KZCl4mlHPDd1jrT/SrQiWtyP/ZUzDdNKWH09QdNRNf?= =?us-ascii?Q?zKHxAwE+nkmSAOChxY2PfAtZoV1b+vFf/qj8/jv0flW14zZC+SEyWSqFDuSf?= =?us-ascii?Q?R9vOTaS95Xvd6UlFG2q7DQf5mGl6kIG5PKMPvPKgK0BZYcFRaUgruOeOxhig?= =?us-ascii?Q?qCdgaNlyz2r5oYiFHmjSmGk+VeXRuXxesg+SEn1yPAjTAA4TEqf6qRC13Jg4?= =?us-ascii?Q?iAss5L+eS53WHaWQmnyKn+8IWecSjBMyk4oTvhd9pixvTYQh+JlFJBddhxbk?= =?us-ascii?Q?b6YFfgFewqAE73CgwrjGXQ6+zpkb+ol8jbw2W6DFNSvsE+bbq+7vxR1o7QPY?= =?us-ascii?Q?7rHv6Hg1pO3SoveYuhEq4DgbaW/3J241alaLnfiWfEtSMk8Mbo4DTB4O4IOG?= =?us-ascii?Q?3KYCRtnzboFmtfCm1AptEWM6bicbcgOJ3eddnVz7utSGBtq1w7al2OtXy0oW?= =?us-ascii?Q?kobJ1d+mehrveUm1bEHFkl7HGuqTUcenTAgaU9bzN8g1cE9kivcP7tXOe5//?= =?us-ascii?Q?ziupXAvAhVnofoJRFzgM0maclSXX7wIO74Mx+DAY7nEdkTj1E/0sufp7vtFo?= =?us-ascii?Q?ZHXPC4QvfuuhSn1/QYvUAOS5M9IYymJY6YYo6LWy7SdJw9TE+yLokDGgDgx1?= =?us-ascii?Q?/Nkig/AVBs/J9gft7BjOXThtZeeeN9WJd2YQaa9Vg085o9ooRalat3elFWxg?= =?us-ascii?Q?StqJ3Rhp5UvMeLnuCndakQrlUHdLPJibeh/6uSSv8/Sp6VxiBFrEF8irnmMB?= =?us-ascii?Q?7L8PPJl/m845+uZIYNtcbHLz7H03g3aZ0QUMZgzh97e8M7MIvGK7hDbiOanY?= =?us-ascii?Q?Yz3jfde//VBz1BXECibPHhNBgNiuGhsT1EZNT5ZbBWzg7+XChHKE+WuHa2DS?= =?us-ascii?Q?IsClBlPrYj8J3WEJ69IzR0Y6vh2jNyFphsCNcb19UF3qq5tqU+6mIfVxiEmr?= =?us-ascii?Q?lxQmQ1ItoKz3w2aqj5Uev3Smfyjl5nc5N7yxQ/PUUUyHj5afmOdeCJEifU02?= =?us-ascii?Q?cJIqBrWfIcSnTvkzSUy9i41VOKiPiWDsJWxyo8JX6Ruzh3ADWeUuKjfqp5+q?= =?us-ascii?Q?ipQ0qsXiVJPGrzZzu8yOoWZAeCOlluTsewLPGVm5FlxCg8aTnEBiq4a8WjOR?= =?us-ascii?Q?z9haIkoYThuuUefuMQACHJux?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: db188f0a-e5d6-48a4-13b6-08d90e276497 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2021 11:34:20.5046 (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: eDZtZNHwLv9qtARXIzPoPcFaC47VwjEVzTvr9UVE735SQxE0VTRlywx6fXq7K+UT51xtW7qOxvPDnHtaGyH5gwSRhD/PFYSqKB2Qxs8t088= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1713 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=40.107.20.96; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" All existing parent types (block nodes, block devices, jobs) has the realization. So, drop unreachable code. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Alberto Garcia --- block.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/block.c b/block.c index 1de2365843..20efd7a7b0 100644 --- a/block.c +++ b/block.c @@ -2037,11 +2037,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) --=20 2.29.2 From nobody Fri Apr 19 10:32:49 2024 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; 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=1620041971; cv=pass; d=zohomail.com; s=zohoarc; b=PnZHHOiz4MY+SkJrEedv/Y72CvoBe5Ay/fipipOzeLy4jKdkn+gaWgc5/cRZc3oJEsBqUNbeETEduNb2EbFyV9jWwr3bVGpJHmGcGS3VKRbJYEmD4kjKhDPgj1FXtNgJrwJmXhJwlw9nDc8HYkG4AI7ME6B0+660wpXNXTALIqo= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620041971; 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=A57FlMGw47mIFakvo6dwmo19DV/SU26h3Q82FOnu5cM=; b=nF4gsMUQbB7jA0iIrTJm4QXBlJRjhEgVR+Rby5n7S9oYuopikBwlkS+ZOpQFyR+CfAV+EUlSD/nnuaQegAooa2sFIDLjmypyjkrYKPuAKMnIm89r0ldJ8/3PxPvfcUgngzG3xoZORNFzaFGp/jjDoM+h12YtQkOcRJjS1I0FfwI= 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+importer=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 1620041971085620.495910861987; Mon, 3 May 2021 04:39:31 -0700 (PDT) Received: from localhost ([::1]:42394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldWvC-0004z2-0i for importer@patchew.org; Mon, 03 May 2021 07:39:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43600) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldWqJ-0008I5-Ep; Mon, 03 May 2021 07:34:27 -0400 Received: from mail-vi1eur05on2123.outbound.protection.outlook.com ([40.107.21.123]:59200 helo=EUR05-VI1-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 1ldWqG-000096-Q3; Mon, 03 May 2021 07:34:27 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4407.eurprd08.prod.outlook.com (2603:10a6:20b:bd::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.43; Mon, 3 May 2021 11:34:21 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4087.039; Mon, 3 May 2021 11:34:21 +0000 Received: from localhost.localdomain (185.215.60.251) by HE1PR05CA0255.eurprd05.prod.outlook.com (2603:10a6:3:fb::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.27 via Frontend Transport; Mon, 3 May 2021 11:34:20 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B3lGUZYj6SCsgHDHyhp5zGoRA+p6MGlyVjIrF4KgtbLxZzvkoph5Dn4WCqskf+4dzWXedqbHVGyOIMnuET1OVOpEGPzYFkpqtFVCn8jC4NZCAK5zSxi7bjjxyvV5F2ySp1GDYE3U+5g3QggMYctEwRHIeGSGMgLwkOOj/yBFYqT8IKL1xYrqIA70z71r4EvvMjwy7Ts69davYwCUFQfRLShIgzkAlFcHAMbSYleKy5Bf4VzKox9wP2UOIOo1AZ+3qiery2eVx/I10mgEhR5lZSL9Gf9WhABjGb0adLWv0UiqMxgKNs/v2MblbgLGUJ3VzUdUU5Xo/vEM2EGuJr3iHg== 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=A57FlMGw47mIFakvo6dwmo19DV/SU26h3Q82FOnu5cM=; b=b1l0Ql5Jr4cTD1XQE14sxd7tdtx8pZjqefgPOOdEMc705Sf4BEgC3N7/vWPDbQD9hNqleE5y2dsHwia0FwFX/wANB94KmhYnpaTEtnZff+MJo+iqLoqclQekgSe2RJ1kNg9lquWfk3dYihQzFdyQUAzYIRBsBvWPP0k9Tb6hnO0SRWU4XI2uqgmqyyNYbqcR+4AADWCoGBnSA4H1S0+WL+tkeRfOf6E34BO/2YablDJmnL0F4IXNfLNQAqdFsodpQJ5mD6HR7ZkOkeRI/2TNZvESnudIx320Puqz9rmHKT9CLhw4ALgeIUvLRta6Iqize0D2cHAPqt+URZm3/WW/aQ== 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=A57FlMGw47mIFakvo6dwmo19DV/SU26h3Q82FOnu5cM=; b=FL2SuSlQYuZ/GItA6C7reQQFwtXJUkXddwUQTeFMfIMuZ4sHkKgS4HVETWOHfxpS2iRIP7SYUJmx+xUfQCJ/ubEl06SjTXX2gc3NxKPnIUTlHOKhBOhd6LY+kG4SRpa2a80eSW90iHfphMjE0H+e7hojdjyLxMSRbtpXRCssr8g= 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 6/6] block: improve permission conflict error message Date: Mon, 3 May 2021 14:34:02 +0300 Message-Id: <20210503113402.185852-7-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210503113402.185852-1-vsementsov@virtuozzo.com> References: <20210503113402.185852-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.251] X-ClientProxiedBy: HE1PR05CA0255.eurprd05.prod.outlook.com (2603:10a6:3:fb::31) 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: 8af65f31-7c40-426f-3230-08d90e276513 X-MS-TrafficTypeDiagnostic: AM6PR08MB4407: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:229; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rNBGn5lkb08HrQ3dC9WOhQdbYEW+Nk3brQKRAGPeXoTJXk56ROTrkpPL2VVm67olWAX1zbe0umKRNodqP/8LPnrFVB/fx2vXIcQe5PWJTL4M/F5DS1lCUv2/n+ju6U+8brF0d6snbAPOIjn+Mu8U9/wL8SZf7elHZ3vH4R2qAE0DP/jMcG4AOO2LF0FKIscsh8fUh4KutZHPY72k05cG8Q/dMxXIk6Pr6uW1oFH6PxyQNwGB7nAVqcBD705eU/bTVBrdwi6UVJU5Yf6gi2DyGiJAjaoRjLGeDjNkU8F6IA5MMYZDxNcBl9/Y+7y6nhwIh2bqP8psQyVudD+2ikPr1BVngaYOIH1Lr0I9vzUMywF7R11P5deQwd9zkj/CdVZXrjSbw285n9lu72D7TfegPIjPDsBd8xNfPO+q5q/T04yUYwGuvyZSHIZrIuqiHMXBGsPC2T4rtlNoTrzmgiF5NThvunB1M7E+dDNKgIDbwU7EOJGTs72PqM8h6F9bXlkE/R/qxvF+8dLYOtYo+mucZFlQHvMz81xdTRHQzMTu1BlzXWfY5NRTEpPOGG1EeS06qCPg7vVKdGFGuDciCVv91r/ups0dgGHYc8+a0CbMtM4abF2h8WEDH66kjGBrqCgeErj41xi3Wb/RHjcDzSNK/jspqlyj+EUNq1zSo+ap67xZuSw0Y11jazT5EnriRiMU 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)(376002)(396003)(136003)(39830400003)(366004)(36756003)(66556008)(66946007)(83380400001)(52116002)(478600001)(2906002)(16526019)(186003)(8676002)(6666004)(15650500001)(316002)(956004)(2616005)(5660300002)(86362001)(26005)(8936002)(6916009)(6512007)(4326008)(1076003)(66476007)(107886003)(38350700002)(6506007)(38100700002)(6486002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?/T+rn4OZLND88fIS6QZ1l3S/IpuPuIq8OJwvVC8JQ2DtILtqemVHVRqGXxZl?= =?us-ascii?Q?XSXVcuFKQ1cNnOWsLXi/HV1UQgKWlkYP8ndOUz2Ce0jPX7HzR3Y++IRpye2G?= =?us-ascii?Q?w+2jdH6pi08+9pMJA7a5rTcOdD2gnnDt+ZCFHRbIWP0LT8/gQb0FhFPmDXxo?= =?us-ascii?Q?sCUZC/nBeN8cEr2pX+Se+MPz77Z89gvYwU8VYssOoDySl/iCR9QkbvPttvus?= =?us-ascii?Q?SJ2tZ9/ToxE2RpnweFWBNRlNtWAHvvprB4o+HtPbQ0dLtNmN+YyEOeTdNte8?= =?us-ascii?Q?u3Ubn6Egm9SUO/ubIDKMKKq7wtm0fJSR4sMwcsW0Qu0jmrjkqlmvIb3gnPZ8?= =?us-ascii?Q?cMftaKLPrqp/EMyxmn+/9IbwtGUngeW1ip8/q9l7xpxXJJkt7SYn/PFekT/j?= =?us-ascii?Q?n9Bs1JQAkFXW3mhHl4sQbVm2YjlPIBIxVKSv3GfqAbpgPiGRdBxM3n+Yy2Nz?= =?us-ascii?Q?gpN9nUEypGKtONlySmr/svPYufUBJ5gzRYkjzYtZ8Xy6CbSryyWnhUO75VCV?= =?us-ascii?Q?ZMxKhad4wRFOIMIS8siy0C5KP+18EpqhuL+nV9pDIaiKeGR6YprlRuF0RWxZ?= =?us-ascii?Q?dC+dWDx1ceeWsu7vE/NPmUThv0rgOD2ChCXHLQ3zV8efPwFtyz71ZhCLpPWI?= =?us-ascii?Q?m2LuG0ZzVotR8TBzJD4pCByF/hNNYE4rN4eNdX7XFHWCdGC0Et1FhvqvRYUr?= =?us-ascii?Q?CkI/h48NxfB3IpcDB49TFwyTUjScjNIgA1o9wvPxzoPOFlYPGWZd7g6zvV5P?= =?us-ascii?Q?z3RKOK/DLqRI+qhqI9tnKiVeDGlIGNv8PyPCM3bms9nFyvlz9P2Uf+YiFfge?= =?us-ascii?Q?jY7ztrBU0x6/5GdbqnppytGuZJXeH/oialR9J75E6QjMfQbj8PY5xZUX/RiW?= =?us-ascii?Q?fbpnjBuB0rtuzdA/Ogs8QcUgmT0nlLfM+QIqpVukj+Rwdn6SMbZkyEcFCXKd?= =?us-ascii?Q?JJ1xbY1dpFPopDAljAwCywvmmWnBNWxLcKM+QAMKkMXaHslkbE8B5l2dGLGZ?= =?us-ascii?Q?LFhMc9nNQaVs31e15yK47CzP4WLvEB1YDIDcpf5MCR0+wwxkZ4V833p/OatU?= =?us-ascii?Q?P1L8hqGHU6NcgME1E3FqPorEs86WlXf0aDT6lwJNwBpMTf47NRpEzd5DtPcz?= =?us-ascii?Q?C+uouB4e9ReZQNP8wkCZttqXT1bt3lrZjN2rwjPNh4ooprSHpp7DKFTti/YI?= =?us-ascii?Q?ga+d/2I2wsR3l/D6zx+G2lqLhscA8SGz8mqY9K1GxHzwtegimDCka/GNwsfH?= =?us-ascii?Q?A7v1fYZ1d6nt7/88bXgKxD0BElfnF7ZP+nIPM5uWOBH3TXFfGC/svUzv8G4z?= =?us-ascii?Q?lyAuY/d48lojhP/Ire+xrB+p?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8af65f31-7c40-426f-3230-08d90e276513 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2021 11:34:21.3439 (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: Mr+Icm7mK+oLWbwlcmHKsazpW7+Hzp6gEjZ9ak93Dvc446VOnluizMOsMfv8IrU5EJT5VjtSeWclqPJ7TdDxNIPc2TjEJeBqB9OC26tK+F0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4407 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=40.107.21.123; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-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+importer=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 20efd7a7b0..3fc87fbf90 100644 --- a/block.c +++ b/block.c @@ -2040,20 +2040,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; + g_autofree char *a_user =3D NULL; + g_autofree char *a_against =3D NULL; + g_autofree char *b_user =3D NULL; + g_autofree char *b_perm =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)); + a_user =3D bdrv_child_user_desc(a); + a_against =3D bdrv_perm_names(b->perm & ~a->shared_perm); + + b_user =3D bdrv_child_user_desc(b); + b_perm =3D bdrv_perm_names(b->perm); + + error_setg(errp, "Permission conflict on node '%s': %s wants to use it= as " + "'%s', which requires these permissions: %s. On the other h= and %s " + "wants to use it as '%s', which doesn't share: %s", + bdrv_get_node_name(b->bs), + b_user, b->name, b_perm, a_user, a->name, a_against); =20 return false; } diff --git a/tests/qemu-iotests/283.out b/tests/qemu-iotests/283.out index c9397bfc44..92f3cc1ed5 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': node 'other' wants to use it as 'im= age', which requires these permissions: write. On the other hand node 'sour= ce' wants to use it as 'image', which doesn't share: write"}} =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..e03932ba4f 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': unnamed block device wants to use it as 'root', which requires these = permissions: consistent read, write. On the other hand block device 'sda' w= ants to use it as 'root', which doesn't share: write"}} {"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..b0596d2c95 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': unnamed block device wants to use it as 'root', which requires t= hese permissions: consistent read, write. On the other hand stream job 'job= 0' wants to use it as 'intermediate node', which doesn't share: write"}} {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_EXPORT_DELETED", "data": {"id": "export1"}} *** done --=20 2.29.2 From nobody Fri Apr 19 10:32:49 2024 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; 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=1620045077; cv=pass; d=zohomail.com; s=zohoarc; b=Y8kLb9VtBlfbDJ+H941UqccDwLZegQ7rIBo5Zwc1uD6RMNnWBfr4LWHnABhOXu2zSHItbn6D0ZiaC1ox/XAxwHK6Td1mtBGvPqHFmnCpzrQZ2OFvvv4geQUsGmSpn7mKp9jv9KwBF7rjlKhP9JkcNaI40avDofFNmbnYMkU/glw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620045077; 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=bLeZgVfmlAREVjHiEjMoTzWcRY1bUfrQh1Cz8fQFEA0=; b=NRTfX+Yonxnn7jVLqz0Oq1TqcUEKIxgCBojjpWF0Zeik+k643HjyieInzycmmDn/6RHhPwaIQO3wEZJ+0GENhQOJLqSug5C+JysXTrd3Sl2f/KomGttOeQ11Ji+efho3oNXZncQUGH6Z9PN8OXrzEP20DhH+lvr9snMYUvXkvBE= 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+importer=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 16200450770591020.7778729819233; Mon, 3 May 2021 05:31:17 -0700 (PDT) Received: from localhost ([::1]:55374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldXjG-0003QM-MW for importer@patchew.org; Mon, 03 May 2021 08:31:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldXhU-0002fM-AZ; Mon, 03 May 2021 08:29:24 -0400 Received: from mail-eopbgr80115.outbound.protection.outlook.com ([40.107.8.115]:10478 helo=EUR04-VI1-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 1ldXhN-000872-0T; Mon, 03 May 2021 08:29:23 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB2034.eurprd08.prod.outlook.com (2603:10a6:203:4b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.38; Mon, 3 May 2021 12:29:13 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4087.039; Mon, 3 May 2021 12:29:13 +0000 Received: from localhost.localdomain (185.215.60.251) by HE1PR0902CA0045.eurprd09.prod.outlook.com (2603:10a6:7:15::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.27 via Frontend Transport; Mon, 3 May 2021 12:29:12 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=axp9umTed+tMpaPQJlpXWE19Hyn2vD7zDSkNC07Wy7fJi4YDONZfIrW8QPqi8+sCtMa2jT8jbqP0K9BO+tBjla3H6uFXw/cCKzho7elWVYaUc/A9aFoWV1UGLM1bEtbzHcvwUP5a4LZkVqA3E+h326TUyB7QaftpMrdBaB5Mb66iTMYLGc1DpwSDjHXoWQ85DyKRVCa5S17fq0keiTC4LsjzdEOLsciWBc/5nTcfhz8p+82EVG8iFXEE1qDnuG50IgHcqCCtrl+oai5Diy4SE5Gym6M9JlNxaK7w2jYzEWwPd8tmgdKjHaVseyaqAem46fmEkqJAt/VKQgIRtIyq0w== 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=bLeZgVfmlAREVjHiEjMoTzWcRY1bUfrQh1Cz8fQFEA0=; b=J4hMGpl1W9Op4Rtf2WQVytuifn4xStPVQDG7IZCyP3C9b5sCoRZFxRgi+aeOZwbzGFZt4G0J6+jVfOcyshk0KdcbapSNCv27QYBa8+31rinvWWhIi/CkM/uWtgxiuOezYxluzzQGfqZO3eX9hWH4FHQPYZNcC8NxieCHufpHz8IAM0g2+G7CfvPQpVqT5ITxH4ixIXmL+99M2lEiSALGp2rqhJgr3SISa0IUJ3X8oW+laKybnTu7P6IvkB4En8sM9PDNKiETiAWkBbpEa5z1pCv2BzPs003+PYsQmAoMxEibRg8zZtdrL2XU21saVnCcyhuS3nDwa/wnuBAJt4aOGg== 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=bLeZgVfmlAREVjHiEjMoTzWcRY1bUfrQh1Cz8fQFEA0=; b=TkcVKQdL2aW28RiZj0omdFTyO0PtO+7xHQNgsawfUQTVx+CmJiFF6ShaMINNFBw/ebv/34cEWrv5vPZWn/VnnfLu89+yuyoU0kgA24E91vGr/HUtJIi/JFcew31NebWVoY+jgkuwrV9xFiMfbswTmTGgk5w7IZB7m5wGqAHtJNo= 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 7/6] block: document child argument of bdrv_attach_child_common() Date: Mon, 3 May 2021 15:28:59 +0300 Message-Id: <20210503122859.187159-1-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210503113402.185852-1-vsementsov@virtuozzo.com> References: <20210503113402.185852-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.251] X-ClientProxiedBy: HE1PR0902CA0045.eurprd09.prod.outlook.com (2603:10a6:7:15::34) 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: 5d30a28c-2e05-41ff-0536-08d90e2f0f0b X-MS-TrafficTypeDiagnostic: AM5PR0801MB2034: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hs5M4+1E9vX50XD+DvC9STUzzn8Q5HeRr0cf0FCQ9nYDOUeIY/iOV9u8aWp0rcOGwLZ4nwY5lQ3xrghcRBGR/u9qZzak2QJqXYk6sLT72qV/IG0ZUOZ53TARabZ611nhm6HAPhONpTUnRcTPmQjycoIrxEBdHKwGqjPsE1X94EPC+BZ+gJ3amUg/Z0eMS0lbIUuqbPGMtKbySgJPjBGKM+fEdiN698G9x4uKhthSXObSlrioIwpI1V0Xb+srkXTsN7x8PoCjfy5nDGn3uK7S9KD+8Pu8g0rF0wsdWxc0RkO82BtbO7ehBXhRiCnTtoM2CMBOaeCAptT9TXU9VzNZG0QAOH3AzlozoAoZgqfqPszuvuBb4SGDhRotnx4bh9gJOvZigSDEv67cJ1C2SNEIWZHWBVjkoCEuVP/XooGhXnicrT15FpFbompNl6KpPgwTxmkB6i4hHil0BOwfsHQbXJTAySxLTJuXxRv13xCBn0q1q8xLRHLEHQR5YpTAAUpgvrlIaDRq8sj+n2wlbPEi1MKep7vRkuIvrR2UrreI8w/e/ZhM98lqhxcIfyk+5HGZ/ZGnnlGfWNbOoN381PfATfMiMqFUxfF8RED2k/GeUysxFHhHfxnIBF8YNh/NRlLpfvCHj85qSwsuUriDl5i+NvB+U7ON6EJ9wUNP434t5i6qh1LpO+Ozg3Lw1yfGRxIv 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)(396003)(346002)(136003)(366004)(376002)(39840400004)(956004)(52116002)(1076003)(38350700002)(8676002)(38100700002)(6916009)(6666004)(2616005)(86362001)(478600001)(16526019)(4326008)(107886003)(2906002)(66556008)(66946007)(66476007)(26005)(83380400001)(6512007)(36756003)(5660300002)(6486002)(6506007)(316002)(8936002)(186003)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?VE7R6IXDZEtiophb7QRj/mFkaiRQDAce17ek5q/SJmukA4sWlywoRZVf1GyZ?= =?us-ascii?Q?KKTTCsXOrQafC/RmezfwASx4/rLmk1Ca4glqZKWGJe2tmga6gLwfSD6AkHv5?= =?us-ascii?Q?HtipmqHXJZyNP6+/voD2PHwfLOg2O2R3nuxHDLSxWenLtXbOivc8yrq19oGm?= =?us-ascii?Q?RuBlplOgCnRN/5lOExEsYsR2wKVXFPllE1nFLZebqTaH7yR3EOC6ZwxpEoOR?= =?us-ascii?Q?YGxzqz0BNsBW4stqQqbmAc/dPNh4xRoXjuW7S5YKpIcuEmyo2nAELXc74CbU?= =?us-ascii?Q?MUBhv0WkYk7yuFd+AJxRoGTjBg01/Q/51r0mYgji0buweahkv/7XLHE32zS9?= =?us-ascii?Q?ruL0gRkXp7sftSW6dbKpkFvVKprni7+ceP4L90cmWWmwwdHkd8bXMxgJup9J?= =?us-ascii?Q?lJVj6gKtYFlhAvwfYj8XFhWgs1gd4SBz1B8VpFJDwNbTeztiXlNUX+/EBWk3?= =?us-ascii?Q?9P2Mw4BCXOGIUSyJ0uCYyDOO++NealiSNc7y08GNpoK04nf2BdjzUHL3UKzM?= =?us-ascii?Q?ZLPFvqzsBjG8D0skZw6SLy7a3WDxUBmhHfYHxnIYO4C/sNv9T7t12bnc9T7g?= =?us-ascii?Q?5gaIIPBnT5xv20woFNWD8npKl4Cm9q18VNE+EuEpy7tn4PK3icms3AY0WH3Y?= =?us-ascii?Q?mZpH9tOYe2iBNgjqaArI6XO34AKBoL0VD9Rk+VyW78uATTEz9ax6iBj9U4r5?= =?us-ascii?Q?XKr3e96DMJlkrl2mgbv/zPz/CqrHjFukf069T8Dw4db5+mGopfuXwzEMuTKb?= =?us-ascii?Q?3P/THN8oZguzU1XbfJX2Hf/ALKB1S6IpV9phzx64HY1Dqlp1kDMbgNOwMSav?= =?us-ascii?Q?8ORdYN8Ye9gx6It9KssYGswySW23W0+ZjUi/beVubd/N5t5hrodZ2fdQpip/?= =?us-ascii?Q?AVp4OTNFsx+eUMQyhBHrffSJWnX/yJvdtKOnJ6aHOnqWLwL9XR6CgNef6uwN?= =?us-ascii?Q?KF1M10pu9MLshGwDQNkNOTWR7jii/1nwkxsViyZqlUJ+66NREvywfd8lpGxf?= =?us-ascii?Q?lLEjJH+29nPTYOa5yCdaEDrPHHS8LfBl8dz6ZN8eh7sieoFPG1EdCJHDqVEw?= =?us-ascii?Q?ceYI0R7Maa/WuTPVrCU1Kmjjpj5VNBKc+Bl/ssV40qaj+VuTNpiysvmnqHHQ?= =?us-ascii?Q?o5ubBxLlAnXOjWTIXjEqNK/LX/CN9ZbIhySfL65Rtm1VIFirlMsRcIsaO5+T?= =?us-ascii?Q?2PB22r4cMuav2KEsTVQRD2IvYikQGqd4CQ8uJADehWdqAfDsAT0l/2Zzf03o?= =?us-ascii?Q?M0W2Rixjv//6YOJmClNN/HeYVEdWWLSG21KsGrFLU3CHQ5pbWsi7ke7dylUV?= =?us-ascii?Q?Vhn1DuwIL79N62OIenkWTkX5?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d30a28c-2e05-41ff-0536-08d90e2f0f0b X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2021 12:29:13.0299 (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: 6ug107oL+pipFMMdeNHN82jzbhubqmVIYrlZPlECENdFng3LLq5IsuzBMByes6aIfI5FRJBG2NpGuQP6o2lpfAEnecbg1OIX+7DKYHn374E= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB2034 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=40.107.8.115; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-VI1-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+importer=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. Let's document this. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/block.c b/block.c index 3fc87fbf90..1f89be6f97 100644 --- a/block.c +++ b/block.c @@ -2773,6 +2773,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, @@ -2847,6 +2853,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, --=20 2.29.2