From nobody Fri May 3 09:36:45 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=1624112630; cv=pass; d=zohomail.com; s=zohoarc; b=YSKjjJcpsCX89k/UFUnjTsuB7lDGEQTm8Ysp25q6t9kNr+L1ls4y1+v7ThK0NOHvt+40Z4DAdoAkW/3azKcok+TnZk5cXSQUOPvvkpB5LtCgVkjIhamOOyLWUsNmMEf5XljnSy8yB4gxph56N+c9gG+40e8m1+VR2MOUBz4d9o4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624112630; 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=s90z256Fz2CePIbhV3KxnzB8TYondVkOTrC8PgQzYco=; b=muPFTDrxR8kyHG79cQgtRKAHDEkQrNvBAF06iuvFsACPKBZUmYLbkxpk7GXs69a7Y6/Pcncv9I3y1J0ArmUUWb4eLux/+sTMaC9ZzsDO1vvNG+1WqEzEh7ZHM1vWn+D/6RIDZ55k9p+r8pAY0dLeasQEUuMCmXbqnto26TJs/rQ= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1624112630180538.403407861579; Sat, 19 Jun 2021 07:23:50 -0700 (PDT) Received: from localhost ([::1]:52716 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lubsz-0004hP-66 for importer2@patchew.org; Sat, 19 Jun 2021 10:23:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lubqz-000256-4M; Sat, 19 Jun 2021 10:21:45 -0400 Received: from mail-db8eur05on2121.outbound.protection.outlook.com ([40.107.20.121]:8480 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 1lubqx-0005FQ-EP; Sat, 19 Jun 2021 10:21:44 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6069.eurprd08.prod.outlook.com (2603:10a6:20b:29c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.19; Sat, 19 Jun 2021 14:21:38 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955%6]) with mapi id 15.20.4242.023; Sat, 19 Jun 2021 14:21:38 +0000 Received: from localhost.localdomain (185.215.60.221) by HE1PR0902CA0059.eurprd09.prod.outlook.com (2603:10a6:7:15::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.15 via Frontend Transport; Sat, 19 Jun 2021 14:21:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=THLEM/Df6dRJWxZu495qWUBCJ7/w8q+GFYXat8T4yhevIju5ZqBoREUp8d8ETKymK2kUFA9uuL3Np0BfjoBbYEZGnAkGk2nVXl+5HyKaVyV0MCujcVnfG9760dNaHjQuiq19fIBtSLWLYTAbRt5Aj1pNmbz8B5LpKLFEx0Jieo4vsdUCk23GpPOjptKI1xaxnqUxerIXT6gYA6Jw6vQrAJqepVZQEty3YMPCC7BeI63IgM7NxMMXb+2SsygEedRauYUPj2++R+lO8naooLF2aQwz2+aXUYijR9nHfLYokduIw960g3E1ovvlLdqr5VUh7kvXhoqDkZJQb3O/Y7dzJg== 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=s90z256Fz2CePIbhV3KxnzB8TYondVkOTrC8PgQzYco=; b=MNGtAkn2KTZwiVF7Kt5xopJX0iuvt4EWsOSgvbCgl3Kx2R1n6EU0XdgDhpwPRpW7x++aNt3WCj6T8WXpGbEk2CVwtpq19YH8F82i9rQREVJWSoT0RE3dyoxUVn72WtFUZIo73YnKOBcIVRd23q/RZ6vC5SGV8QBXrUqxiZKbUHGRFDdTp0dL7LglPLKj81TiGlL5tTgeWBYSalVBBd66WjpmLqKSfDblL2nMC8Ucyhw4HpW0Lq8k1H41HbOtErrJyKghF4FQVakRHve4bYctXNspoBterSKgYLLXg86tLRrKXG8C4kwirRdXQhsbwaxccZgyXRSkSNqk9qBEXy++DQ== 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=s90z256Fz2CePIbhV3KxnzB8TYondVkOTrC8PgQzYco=; b=Z/R5yLg1IQhL/Jov7GqStLTWMxNEHKaq4/GZvUjBSoTfVeeRLoxAlQdNax9TdtzY7aoNOJnA513WNyZ8jH+UiQMIplfJbAkH/ncdVj98Wer8V1lRJzcqBVR/ZjR1vmu6oRFFCn+4aM0YI7QO1ixc/5/+BIpBn6x0fcg2Ogvddx0= 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, jsnow@redhat.com, eesposit@redhat.com, pbonzini@redhat.com, eblake@redhat.com, stefanha@redhat.com Subject: [PATCH 1/2] introduce QEMU_AUTO_VFREE Date: Sat, 19 Jun 2021 17:21:19 +0300 Message-Id: <20210619142120.48211-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210619142120.48211-1-vsementsov@virtuozzo.com> References: <20210619142120.48211-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.221] X-ClientProxiedBy: HE1PR0902CA0059.eurprd09.prod.outlook.com (2603:10a6:7:15::48) 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: 911b170a-c05d-4748-8765-08d9332d8d16 X-MS-TrafficTypeDiagnostic: AS8PR08MB6069: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1468; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LKlN46y718QoT3PZ0Fph4zFL3CnqE5k1kzI/N4ZH8Dh4slW/QpsCXZaPqb62xnVrmOCO1De5ny1CBzaNRbusriVdvQiM6LLM5bW03x3PmmcusDPvEiJBQfCMwK5yMFDT6fmhO978ztqQp+/qQNLdv6V7ZZXG7inPhIXZ6f77bcILkp70eltQBGmu9rwa4nyReGqd7RA3Euh4TaeYqX4VCu5RjfE+e2lqKtT4r0ckPw++bRsmgMDIt6iVTYHzZ4VpDO62v9E/nTqIaEdR+vGUFORF7vZ/U5AED6zj1Kjnpv+2hW/mPWLr0dOJwSoE7mS44O5rcNHWDmGacyZG+uJtsWBZMENirtWq7A65x1xhoNpYdtEuzuiY0svl3kcf1TjS/8n+rbIMdJFJscwuZPorfe1gPZu2r1fdqNtCB+34/l+zi0aci5wXrT5Xkxog6UAA7L56/vn8knzIh47nmavPFimYMkLLcUgmCUc6qaZisd6hwjQlFR+Hd5MONLuZbSRf9tXM780u3xXCLpPmfYFGqDZrUX8ececBjaYArIXlqdQH9Rq1Ykm5vbllFSKXBRPiiay0e6yKAHe3qu7JuP9mcXPZNFtHZm6TgWHXuifnLt+Yf9HMl+vvZGIxdYs5XJBbwhUuXGA3W6UWY/QmhzhgQAOBAY9UxA2D266l9RDfByB1gz9kyTacS5VVqhnhtKKs6Aqbr3EN+wJDQJBzl66bsQ== 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)(39840400004)(376002)(136003)(366004)(346002)(6486002)(38350700002)(2616005)(956004)(38100700002)(66476007)(2906002)(66556008)(6512007)(66946007)(6916009)(5660300002)(6506007)(1076003)(4744005)(4326008)(8936002)(36756003)(86362001)(26005)(8676002)(186003)(52116002)(16526019)(316002)(6666004)(478600001)(69590400013)(84603001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?TKGRruspNHj678D2LVos4px/48cJBVIcnRMm6QznF5+/vlOKL3vCCIykPLDh?= =?us-ascii?Q?/UiHlclBcFulIP838IqeE/fa1Wubjx5Kb1KmYw5L6zlyl/BqWHDb6x+Mjwmo?= =?us-ascii?Q?0jiWWVs3dzyeaSK+PNMVdiL9UZOfrunXHusBNdjHwFj89v1OehyBWbOPLU7b?= =?us-ascii?Q?U3QzM5qAEhrA6YVN2wX0zP28qWW9pzb85NG9Kz/hseuUlJuzWaybEJS+tNFv?= =?us-ascii?Q?vlVWd4Lam+JpyzyTN2QdWKsPmE4gLox8AHUQzQZyGwmjileTzHkf2+AdtUG7?= =?us-ascii?Q?Ioe2fXIdaxvG1M9rYx2UvAwq3N8NAsSF6HMWJ0V1G8uWD965ZLrswCgwp0NJ?= =?us-ascii?Q?dLUbf8VrYeN1gM9wZ4bJPr6yHt6pGiP1e3BFZnaxh59H1TPDAPI4/H8dR8qq?= =?us-ascii?Q?925TlbybO1gyCbC+00rH+KWEao/5SIU1vxLliMOb876dEXDfWCx3l2u1shlt?= =?us-ascii?Q?qG5ENe6OntCK+16D48kvMku0Oi2RLf6fWoc1vimaIlwH9PTdODh1HiYckYDZ?= =?us-ascii?Q?ejkzST98/bsklomlNJAaVw9/+qjg7PPmWOY5cZ0iaeCrb016uI58A6EPSBNd?= =?us-ascii?Q?4G/NCu9zv83qevhZcOMQQZeSybYIG0TsNIgXy2Ezq6C0TSyI6vOsNnU720mT?= =?us-ascii?Q?d5QX/3HCgAQPY3pxsUxAuBh/99/Y8QSTRnFgkXYVsyGZUO81VF1Wyd3NelIs?= =?us-ascii?Q?slZx3VbnuA1SXfpqD7jwV/850QO6K75UOBgpJFc6rDGCYUAuluPouWQ0YMrv?= =?us-ascii?Q?wxaRlYvbXB9+mxyuhhMvsJXyljZyUX8WbuSwDWPLMH+BG13LYvslLVo191Ki?= =?us-ascii?Q?GxQnYuw1PDVar13cS2Q+qMryGEAa/nVrbyY2EOE52uwKhe8W+ET8dLMGyNxu?= =?us-ascii?Q?ZMhiIgqdUkh5sOkAuUonynMK6Nv170lZheoK9Icx9yBxU9SmzG9u/GwogUct?= =?us-ascii?Q?RWWttuosrITCeWq7zltcpJVl/G/ArzN40KFYF8W6ceY0y0yqOx5iqnKS8qrg?= =?us-ascii?Q?cWrMORm/2wSXLOhlyxGGh8rjUsuDPMTUJvNkca5DoVw2rgcxteiTBpPl6Gif?= =?us-ascii?Q?NQpn0rzYFwB/yhW1LhgcS+L0Ya2YN9HLxppT55si9luw+aazgB5oub7pUMYg?= =?us-ascii?Q?fING9ve+ZZYHZhvANNli93QZU6d0WqcldLBC+Ad+orjH2LgQGz/Ju7oYyFBK?= =?us-ascii?Q?lRKoJJ0c/YpKYTpU68IhPajCKasVs9rtdGajhAjgq2O4c/A3nSWVB1udzp1F?= =?us-ascii?Q?3qmQ0KbywHXcAR55KG3ut/QPgn9cv7pFFCGie1fl9XHSOLr2fpIJsvKcBUVl?= =?us-ascii?Q?/s9JFjKOM8cAsKb4D3bcUqWx?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 911b170a-c05d-4748-8765-08d9332d8d16 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2021 14:21:38.4857 (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: YR8ZvjgsVD2hbTXuBXrJnQG590tHwsnuh0GjgaA1xMf5pfq5Ume+f6Nd/Axf0YHMRSuCbL2B1LDh4dAXCXsYryUk4sNlOvW0CV6ToA0t/Hg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6069 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.20.121; 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" Introduce a convenient macro, that works for qemu_memalign() like g_autofree works with g_malloc. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Stefan Hajnoczi --- include/qemu/osdep.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 236a045671..844658a764 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -366,6 +366,8 @@ void *qemu_anon_ram_alloc(size_t size, uint64_t *align,= bool shared); void qemu_vfree(void *ptr); void qemu_anon_ram_free(void *ptr, size_t size); =20 +#define QEMU_AUTO_VFREE __attribute__((cleanup(qemu_vfree))) + #define QEMU_MADV_INVALID -1 =20 #if defined(CONFIG_MADVISE) --=20 2.29.2 From nobody Fri May 3 09:36:45 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=1624112687; cv=pass; d=zohomail.com; s=zohoarc; b=aeaFQrPWpFDaA/yrRn1/g03hCBn3X6bEbAsrPjT02ia62+bREOUp4ngpqnoEOwaPqxjlf4/IakJjxHFBuChGLRlt++CjeiEBM/+SKbyMmbjbsNqqYvxbY3A5lS4BiawsFQkZuMvXGXkpVdJkEGZ8pSILfOGKi9WXokoDRsV9qQ0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624112687; 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=wmqoMj36hJwHv6E7LlQpVOTNuppyooZ8e3+T3fvOq+I=; b=nHQ0Nnc0H56Leok7a5zUZFdwBwOROtMEn2Txjy9ZJJRk4epcsmd0iVlSBb5Gf4KWewXiSxfesTGQVF3VVNOH9dYU43DPIwVoOeiDspzmWmEViH0J8wiQsBVSMTMn8M2GOV9EWUKg/nRTbAaFpW2K4tySvoOcjd/bBoX54Vv4HUI= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1624112687696649.9580789557928; Sat, 19 Jun 2021 07:24:47 -0700 (PDT) Received: from localhost ([::1]:54868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lubtu-00068r-M5 for importer2@patchew.org; Sat, 19 Jun 2021 10:24:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49928) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lubr1-0002C4-P8; Sat, 19 Jun 2021 10:21:47 -0400 Received: from mail-db8eur05on2121.outbound.protection.outlook.com ([40.107.20.121]:8480 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 1lubqz-0005FQ-TD; Sat, 19 Jun 2021 10:21:47 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6069.eurprd08.prod.outlook.com (2603:10a6:20b:29c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.19; Sat, 19 Jun 2021 14:21:39 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955%6]) with mapi id 15.20.4242.023; Sat, 19 Jun 2021 14:21:39 +0000 Received: from localhost.localdomain (185.215.60.221) by HE1PR0902CA0059.eurprd09.prod.outlook.com (2603:10a6:7:15::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.15 via Frontend Transport; Sat, 19 Jun 2021 14:21:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GrKMCz5Ob478L7FbRqbhF87BPsfM4vfiJ/sJMEWsmb7U1/ZI9+AFq879de7hBV3bdc6Uxqw0Mo/hRq4zOQQ/prpKR1xY8FktZYUSn9GimvntVQD1Ut0d+WPlmSAP4dd1Aa2ukcQ/+PiWmQ5HSArrApfXoVscQ3cpoj0CVs4O2v5ckWINtBqz3dyyO+DHUe43Eu5s/xk1AOMxIvoq3vFjoE/x1myaoMJIyD4bpaOaQ4BINhN4kUES/oZF5rzw3VJDexAJTicXib1+HXhz+8SQyzAI7NTZon7yeX97/ycaEiFJn3pPgbZHBjoE8GfwdwIjNof/n1N8L1Hf4oJeebWEUQ== 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=wmqoMj36hJwHv6E7LlQpVOTNuppyooZ8e3+T3fvOq+I=; b=ahUVFK51uPzwPSw6xehXcn8dOYjAdSxF4EwhNUvDp+0x8hsEgjAVZAVM3njdBSHc1rk0IIF7M/KBYTTqx2E5xBQrQTbL0JtxzH+nD1XsvTqzXlg/YWB0n3NlCsYGePoLpYDfZ/2WNVTotjXC3vsMvfOuyXTsuR/c1tHlfz36lqbQr8Q6AtiWRB2WgLmet+afAay/Gewiwt6gKkXI9UHmmj4uxZedKWVUzmfHN5j/DDaDGENmdHZBaBPvBbrwiUd4VH+CrK3uKBFX2bB4l8/Mmf7P5uVUNQcHWnvT060kcKH/1X5efm9X/JDoOxqc+UAtq+yiAznWKk2JISmfrj3vGA== 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=wmqoMj36hJwHv6E7LlQpVOTNuppyooZ8e3+T3fvOq+I=; b=mKpSBuUEA86yNsP0pa+gQSGTECbmdMl3UY5MSmj0G/aZm+ojizTtZs6EpzpAPSbJynaKetg66Lhp4399MfiC1sjlaNA8S0fwawDZJ+PNv2j1ZjMoXK42ovZclSqViDRguucekBFkP9URBNQyka5gyBQckOcytNPEk9w1+PWP0qY= 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, jsnow@redhat.com, eesposit@redhat.com, pbonzini@redhat.com, eblake@redhat.com, stefanha@redhat.com Subject: [PATCH 2/2] block/commit: use QEMU_AUTO_VFREE Date: Sat, 19 Jun 2021 17:21:20 +0300 Message-Id: <20210619142120.48211-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210619142120.48211-1-vsementsov@virtuozzo.com> References: <20210619142120.48211-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.221] X-ClientProxiedBy: HE1PR0902CA0059.eurprd09.prod.outlook.com (2603:10a6:7:15::48) 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: 37c6eb7d-b9b9-418c-c5ca-08d9332d8dd7 X-MS-TrafficTypeDiagnostic: AS8PR08MB6069: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:12; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IemKFkzf+notUwq/WmK8qT3xuH8KpnzyWfP8Rafq18hggIqdfc9XCTIig602KSBR4obzbjeIp3Ul4PB4mVg8fQeYaop0Ws0dRSNOhMUcyzN/3tNj91EXu4toaoRJQE1KsN3B9+GmWW3IWC6gOyNCtzVDVz2bsP2j2wufyrRn4q/oldRuTNGqWaq3tYY39AZ6kHtA3P64ulk77hQOlS43lX2iQc0bepEFh8u93CitbW7JjTp/F5k8y53tc3VXYmzdOmotNvQisMm2ltH8MFno3O1fgudly1wXVqqAG3dzZ9kO3g/KjIUgALSCn9T3w8wkPSKWcAKUK3k7SaFPxqm48BhY2t13Gfygo7ANudNTXU7kjauPush4Z0q6JopaKmGQFcOb6qTDkTd1jZp7OxRr8FENONKuoL9tJlkfzf0w/efTM/cPSlRkNQFeOlJv6IKhsyqr37HM0dfNZCU29eWWExCNubUPsjRJm56bzHdQ0rOx3B9uftYzh0ODDsMyOLilx6G80BSHchDHgQ/An33gQ2bwLxDDHD6ZGuq45V2EaV8+XjNFXKwClfTYSt1WVL5WBNnEykIoc97bSaWFLJ6HwF1ymX4ypGPYcnucS9bAAOFOBxDrwEFjLFaykN6tPAJnnQgLu3PTVGTARP7n0ZKzCr87rBNuuC+WG4JDjrFEl8uDufCkrRQFI6OeBt5KhHSyls8opEBJg1ChbecAz02TUA== 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)(39840400004)(376002)(136003)(366004)(346002)(6486002)(38350700002)(2616005)(956004)(38100700002)(66476007)(2906002)(66556008)(6512007)(66946007)(6916009)(5660300002)(6506007)(1076003)(4326008)(8936002)(36756003)(86362001)(83380400001)(26005)(8676002)(186003)(52116002)(16526019)(316002)(6666004)(478600001)(69590400013)(84603001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?W12G1WefisWJx1BCrXbDoBdSU30UIepAspecu4Ot3Q3/gADNroTGQn1p1rsu?= =?us-ascii?Q?FNFrJhiwMjmj8+SyFObXEgxl1eCcL17ab5DbhgpVDiWWArkFlQV1h/UHu9Vy?= =?us-ascii?Q?Q9iRYqp7FFbhud4KHsOxI1JkYmrFtHB82xEY4N+57vkA0epn9Hz5KXXdm2Jk?= =?us-ascii?Q?W+5sAjInuqh0I9BGIsRkVI+14xUUxh/lpOwokwIO1cDMKoO4bRssYJPsytsX?= =?us-ascii?Q?oNvvSe0sThYDR4EQKbgf1/pBwiAAPRt1VNabtQ8ZcpaqTiqmPwrjYusjt6la?= =?us-ascii?Q?b5rHTkOPLTzQZsfi/3IBxRSXorazImLlsa1MtIlMTv6mBaYRv1uX6v4WZx0q?= =?us-ascii?Q?mUNq1SQoaJUbBKFaYo3RONF9QdLcW+leeGGd5FcI1siQ6wRXmzj0TCK3XTsP?= =?us-ascii?Q?RYaY3fKJkLHmFLlgGTyI7i0S2dous3WgdaLSUN8OwNKX2sVTM98FLK+ivc+L?= =?us-ascii?Q?v4k96rLciaWNzB3AM3crvClfFpyFxkHJTpcZk12+kBjhLeLANmzagcwrirS4?= =?us-ascii?Q?gBuAO7+ZtTA/ESHR4Q9SYnJE7AQQEdkmGC1uzAoUdYau7SlSWmdEwZfhwBdw?= =?us-ascii?Q?wwTIWnaVMt6/1Th+zzi9muRwwDrA0dr4ul/XvGj7yO/OGyPYo8ejCoGhA4tZ?= =?us-ascii?Q?JZrtzlRcpui5a2Ne+I1nPBz77HdJc3MXpoBX4KQgszzBORnXfyxEsJ8pSIdJ?= =?us-ascii?Q?I/P1wzkWbxPKuuDE7p3cCFUDjkytulres7AYYPU0yaojA0mIPiekn1fDOxE3?= =?us-ascii?Q?0kQ4t73Qy4EC7dLs9soacsVEm0f0ij7EPyyf96zkX0n9HWEhQsFy8mJV3TGd?= =?us-ascii?Q?yvevL8cWzxh0+ZQQC+tdtnt2R/wfO8qE89YjuKdSy97edSk1Q1lpcRZLIm7b?= =?us-ascii?Q?Qh/JPpD8pDtcf7CLKUR9kzyK8e5c7gabvrTHB1RDylx6Htnpo7dAlDcLSFp3?= =?us-ascii?Q?VtIjeAHGJvcJLq4OKi5UupPq7/zGi3FTwTd2CbLI2Q3q3n/srtxCoT2JGc0T?= =?us-ascii?Q?Eih4ZXtGIo81C07OqAiW0XWSkotpltpe05u55YjBFp24mRpVHnv6+64zuMYF?= =?us-ascii?Q?8IR4EYsI4wF/aJhKeu7Fk7mJMdBbRTrQ8PM+8Tjb98HKcTm7SIkUk7rHLiIc?= =?us-ascii?Q?n91BwWfOlF3HXvbzGDpckvoHnPnovsLKlblTGhqeFBTBp4CT/hl71/C5gBGg?= =?us-ascii?Q?LY3IpQS7Bd7aUkLWEgULJpsEcTmp48beuaMfWeS633ROp5AuuFHK4PyEhIPK?= =?us-ascii?Q?PeQvV2WwCvR995qhMG244xAeh9Ly4Ma3SlL6gMIcAQts5zTFXyfElbvDX4c8?= =?us-ascii?Q?KSQjmt8HETP22cS5jJGPeG6p?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 37c6eb7d-b9b9-418c-c5ca-08d9332d8dd7 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2021 14:21:39.7183 (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: +f00AT7YeF8sSrMz9HF3ULqQpibQNFg5WQPVyfM1vONxuGnpzSqlbNO7+WVtPOOfIiyPzYmS7DINQZgdmi0Md9LOwpvGjRfnmFZBqZ3yxik= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6069 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.20.121; 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Stefan Hajnoczi --- block/commit.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/block/commit.c b/block/commit.c index b7f0c7c061..42792b4556 100644 --- a/block/commit.c +++ b/block/commit.c @@ -119,24 +119,24 @@ static int coroutine_fn commit_run(Job *job, Error **= errp) uint64_t delay_ns =3D 0; int ret =3D 0; int64_t n =3D 0; /* bytes */ - void *buf =3D NULL; + QEMU_AUTO_VFREE void *buf =3D NULL; int64_t len, base_len; =20 - ret =3D len =3D blk_getlength(s->top); + len =3D blk_getlength(s->top); if (len < 0) { - goto out; + return len; } job_progress_set_remaining(&s->common.job, len); =20 - ret =3D base_len =3D blk_getlength(s->base); + base_len =3D blk_getlength(s->base); if (base_len < 0) { - goto out; + return base_len; } =20 if (base_len < len) { ret =3D blk_truncate(s->base, len, false, PREALLOC_MODE_OFF, 0, NU= LL); if (ret) { - goto out; + return ret; } } =20 @@ -174,7 +174,7 @@ static int coroutine_fn commit_run(Job *job, Error **er= rp) block_job_error_action(&s->common, s->on_error, error_in_source, -ret); if (action =3D=3D BLOCK_ERROR_ACTION_REPORT) { - goto out; + return ret; } else { n =3D 0; continue; @@ -190,12 +190,7 @@ static int coroutine_fn commit_run(Job *job, Error **e= rrp) } } =20 - ret =3D 0; - -out: - qemu_vfree(buf); - - return ret; + return 0; } =20 static const BlockJobDriver commit_job_driver =3D { @@ -435,7 +430,7 @@ int bdrv_commit(BlockDriverState *bs) int ro; int64_t n; int ret =3D 0; - uint8_t *buf =3D NULL; + QEMU_AUTO_VFREE uint8_t *buf =3D NULL; Error *local_err =3D NULL; =20 if (!drv) @@ -556,8 +551,6 @@ int bdrv_commit(BlockDriverState *bs) =20 ret =3D 0; ro_cleanup: - qemu_vfree(buf); - blk_unref(backing); if (bdrv_cow_bs(bs) !=3D backing_file_bs) { bdrv_set_backing_hd(bs, backing_file_bs, &error_abort); --=20 2.29.2