From nobody Fri May 17 08:24:45 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=1624883263; cv=pass; d=zohomail.com; s=zohoarc; b=LWd9RkwqBXnvvow811Q4TH/V7s8ifVKSvpmBRslcDSpVqSpji8A2RdE8PvSm1XGamdgCdrx/VM/XzyMZQu5+Obi71dODXBRkm4KnzMGmM3oCXalLcnKZab8sSoW7IwdPIO47Grl4WuQEfUPdtnsvHNVTjiwpJWCJqq0YyEtS3XA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624883263; 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=HRR3JVQjJURvT23v5IFZP5kODoBL+9OMnobhA6WoqtM=; b=fWdJ9Cd9BM1G9YApoV6xY5SsBqdi7eXceAb1kilKHdtd7er5h4ZB/yRZD04h9ZIY13Pql7tM6u7sUBtCi2CFq7zvUbLw2MkF3hUrnjcH8xnFAyXi3pZSs9u1swaucQBc+AHHKc13Zely4SWIRI9szAVwL4qv2e4+GfOVhvxVQu0= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1624883263142562.129524373454; Mon, 28 Jun 2021 05:27:43 -0700 (PDT) Received: from localhost ([::1]:56526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxqMW-0007su-Ie for importer@patchew.org; Mon, 28 Jun 2021 08:27:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52594) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxq7c-0006oq-Ij; Mon, 28 Jun 2021 08:12:17 -0400 Received: from mail-eopbgr10131.outbound.protection.outlook.com ([40.107.1.131]:39798 helo=EUR02-HE1-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 1lxq7Y-0004eW-Ii; Mon, 28 Jun 2021 08:12:16 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1652.eurprd08.prod.outlook.com (2603:10a6:203:3c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.23; Mon, 28 Jun 2021 12:12:05 +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.4264.026; Mon, 28 Jun 2021 12:12:05 +0000 Received: from localhost.localdomain (185.215.60.221) by HE1P190CA0036.EURP190.PROD.OUTLOOK.COM (2603:10a6:7:52::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.18 via Frontend Transport; Mon, 28 Jun 2021 12:12:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BgD5zsZrRrEKnxbcIAujWi0eOTqHwtDj6pn4l5T6iF96xfedy0W/DbPPRPV27sb/ESKRM1xfEV8V2MeA1z/2u36MYRIh1sd5C8ASRi10mt6ubQ5bKf4voKKCfH1WCOCQa1fPm/r+TDW6Dt7ryvMUpGY46TEJ0awGCVhWXVKe+jpIt4hsZoYkUjzd5xutlcHmlNftSaPZDChLwf6YMsDpN2+ajXiT9mMNw84fS6fJHAOxg3IsGrSsKtwowsmrmNPqLuDe97pENFtqoxhd9GnWoksbU3bp1T8Y2K3NOk1qPTI9rsFXC8buA61tPCL1tkbSEXtRdhWtb9jaB+yjL0nLYA== 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=HRR3JVQjJURvT23v5IFZP5kODoBL+9OMnobhA6WoqtM=; b=MG37KBJIg9o/k1P9Dvb4X3SdNEuacIXJw2kuO+UBaj3apoFEhri24Zk2HAPq34MGw5MePndoQlg+0htFQEfetqZWmylPW7z1b/rmYkcf02z8nkVJpEfYxeexola5JPkZQAd0YDdEHst5SxkOimyzcFkEnxTMi7uyrkG2XyURfj4XvZG4hU0Y5NAo/zx0M8uvMFf3d7zmmYLNr6oJo7Js80gZj7+7b3qOF3XoU1BWDya9o86hTVEs6A8eLen3dX3Ax0sUdB1TBiTcWps+EZSCzWbaT+JPzqb7Svr9u/cqVNEwo5VdvPkREsv09WDDfIshAOS0Qb4/Uo9YCW1rych7Ew== 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=HRR3JVQjJURvT23v5IFZP5kODoBL+9OMnobhA6WoqtM=; b=SEZ4i/Fq2siZAjueBXIozYolpCX2OkNBltaFLIKhLQQAXYcm/DxZm3CMJdnAPC6Tc2UHeFuY7QCZf3FPRyMsozPSjU2eVV+pj2jyO98F04GsKxIUcAspaqnzA0oDLSxTyl6flvTuJjOXCJY8rkY0SXLHxOFHCr2fC+gQ05PdwaU= 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 v2 1/2] introduce QEMU_AUTO_VFREE Date: Mon, 28 Jun 2021 15:11:32 +0300 Message-Id: <20210628121133.193984-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210628121133.193984-1-vsementsov@virtuozzo.com> References: <20210628121133.193984-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.221] X-ClientProxiedBy: HE1P190CA0036.EURP190.PROD.OUTLOOK.COM (2603:10a6:7:52::25) 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: 3c8bf32a-0bb8-46ba-3556-08d93a2df0e7 X-MS-TrafficTypeDiagnostic: AM5PR0801MB1652: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Mo9CnR5yoGasOsBFXAb+M/S77NKpGRJs242YtfFPDCZUU1JYij/yZZFvSFi5EYkOIXLKOvkR7Z44pOWHj0GnYiTumHJpFTi7TViWlyGBfq2+aqCoYl66CbhEwz0CyjL++RNe8mExoltZ7auiPpfMNhy2Dmf9XDz6w42uvpQMPJEJCPL1If93QZgqHEXIA8AedmezLa5Lazl1+VUFFHRUpebtjDAFPfYAG/R0BrQXHyv2I5+XYKAAdyzBArDhLeugL9RyU9Fmx42RNCkWnfK9X4NEZdPEzasAEdST1qmJSFl5+zH9tEscY8/HMM3wRpB4wzYAjdUa17eTiOhMrS9EH5F+SNRt8w4FlK9oB1FiMoL1ify378yZB7rMLL5wBWRa1LJaO3sp/yg47/xNbbAqJUAMVEGUNp43eg8jWZX2pptv8twXjcuVRsSxXlxOXJhIC9MJUPlW7/+J4I0lBihGdGAQzbpysJS+Lpp5Xb/zJTJpAuFA1y4SaYWMxpdiEEUMkLv24uKgkslYdqJPG+pf1LcRZawRKVd3GamaQwcicxfqkeMs+oumGDN386dhYnMSd2J35YumbWogTLdWrOeabDCsn9DUqnxCvnwrd6+47eIplWvE8wL0Y3yU7i+QYm28tFLO9OTEg5TQDZ/yOGtActNmzNzplFiIaTrwbt1OmeCfQHqhVEcI8aZXCdeJ/LST5jNxqGCxNDYdxu0Vt8OaI3baUvmQ+gShjbmBRivsWggllVEUdv+YcKH+vT/2JnKPuaFJhRreg2aP15dd2PteEg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(396003)(376002)(39840400004)(136003)(66556008)(66476007)(66946007)(186003)(16526019)(1076003)(6666004)(38100700002)(38350700002)(316002)(86362001)(8676002)(956004)(36756003)(6486002)(6512007)(8936002)(5660300002)(52116002)(6916009)(2906002)(26005)(2616005)(4326008)(6506007)(478600001)(69590400013)(84603001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FLPCW2JrLb5QOzDfqtHNGBIK5OkQ3LaMCyke9KEe7GeWxRH81sobtEFuWCOZ?= =?us-ascii?Q?aIDhrPdeUhidLQU6hV62Q5ES5+vfjizUufOCvj3CVK7hEngsOJ8zzzLq+Bxl?= =?us-ascii?Q?dzA9m54BW5wPrM6fLeUskH11sUAn2NZrkP4M5IVGycqe/GeM/pLAeWYXQv1R?= =?us-ascii?Q?f9ePEirtm9YkwYxlgGNy1NamkgOSys+rMeNYtBUuM5BgmTKUqPdcACWEZNfE?= =?us-ascii?Q?eEAkguFdHEQJVqOT2yvhgWktFkSOLzDUi2PQCtMoXs/M2tgWyN9GxxYFAYOk?= =?us-ascii?Q?mj0iLtcbhQWYgmzGi96iBgcOEIb6+Nx24SgBe4UMtB8pzUxga2QsuQRbbzdL?= =?us-ascii?Q?BepIRKqZ4ZAOQH9Su+Uek5XGN8DQ7pZFRSuxP4BHzhR6C5Dwy0ETQCfpW67n?= =?us-ascii?Q?/W08w0dssqW+lOkJOFctqG+b3T9Mw6Ed0zAaHSegM2i73eiyfhoSWcN143Nm?= =?us-ascii?Q?UQ1KTRaU/mjOoO9twtopFZZNFriQIf7fwRn0ljuEX5r76yMPayngg8wReG+n?= =?us-ascii?Q?UnLZNMLWvsCstaMs592ZcheC421n1JIauIMfi7NLIpvr21ERjdL6vppWUN/q?= =?us-ascii?Q?T/yE09qJvIXW+itn2SThb2Wq7IAZngcOfR4nAJ1aVzZSJrS2VDH63tfYUMbM?= =?us-ascii?Q?V9eqLEomjShgZDcq2EIGg8W+2PHDVTPjzY2Iqst9+jhaVxNRDLQCzga6wOlT?= =?us-ascii?Q?g5n5Oph7NG5Ek3JseCLcSAKDP/57hIU0MhDgkvW3dFYRgBSVkfXjyTXmDrFk?= =?us-ascii?Q?nRGpwPCObBShSQ8IRpkBucCjfp+5Eq2WvJfjdpZE1Lfv72CbnEsa0anwcJ9p?= =?us-ascii?Q?BGBCNXJgs+fXdsVy3jYKRBeWgLaq7DvdlCZBqwFDNRMOBnwWAGR/BwnmgomE?= =?us-ascii?Q?/G5DKjl1ehiAG7GsRfxijffOvwHF/9UbwWbU5D9y4AQ5O6im/LnQZoNbZYr+?= =?us-ascii?Q?TTvBTgFRWA/ZUNoGxvjWso7FQTEUFuP3kpMliDV0ny47otaJwc83sla1D6d7?= =?us-ascii?Q?bST0nhaju9EMInIH0iF95Q2vxHdr52LR0jAtEFB6fKeCSkDXQPWZ27PH75ih?= =?us-ascii?Q?uw9znNlEADeUf2Sp9UniSwkkHdVVKJpkkf8KjDe25u6cCer4iaKJ+Ky77huw?= =?us-ascii?Q?rNEJMAXW93Bjcxy20m6mHzzT15bxvjhUkGuDbtcNGYTvnsd611bwQl/YyGvf?= =?us-ascii?Q?Gj/Z1nd0Mg3CrWqH7BOqp2mv7Su3PivxaP0juqjHLTv+ewzGp6sQQiafwXVh?= =?us-ascii?Q?aFZ4WGOYG2cpovdV5L0JsAsP0wOSrHjhh/EBjcDlBnYhA3KqyZ+YSkEKIHe2?= =?us-ascii?Q?ooVemmCIJnTcawcjYnfbBj7O?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3c8bf32a-0bb8-46ba-3556-08d93a2df0e7 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2021 12:12:04.0802 (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: QCCJIAQRESeqmn03h2Qjavq99OkfB1QVYufFPVG0zS8+m0KDgEQGj2KoUgQcl/bP1JiP8aMkkePPSURy+8Y2yrinwCcEtw0jVZodZaYaDkY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1652 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.1.131; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-HE1-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" Introduce a convenient macro, that works for qemu_memalign() like g_autofree works with g_malloc. Signed-off-by: Vladimir Sementsov-Ogievskiy --- include/qemu/osdep.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 0a54bf7be8..e3a62cce89 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -370,6 +370,21 @@ 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 +/* + * It's an analog of GLIB's g_autoptr_cleanup_generic_gfree(), used to def= ine + * g_autofree macro. + */ +static inline void qemu_cleanup_generic_vfree(void *p) +{ + void **pp =3D (void **)p; + qemu_vfree(*pp); +} + +/* + * Analog of g_autofree, but qemu_vfree is called on cleanup instead of g_= free. + */ +#define QEMU_AUTO_VFREE __attribute__((cleanup(qemu_cleanup_generic_vfree)= )) + /* * Abstraction of PROT_ and MAP_ flags as passed to mmap(), for example, * consumed by qemu_ram_mmap(). --=20 2.29.2 From nobody Fri May 17 08:24:45 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=1624882645; cv=pass; d=zohomail.com; s=zohoarc; b=f5L9IXkkmF2ahL32ZxTh8A8YlBGtKWrj0LZX09SY47CXWt9KiLizu4LrRx8XNBgvqz6NlmNjBQKUMxyZUn/hWHF31opTkNBZITqvbrMLvA6D283xEs20t/0454nAgHyaDozvL8k/s1BUh6m0FUFCJhV0d/W63XgZM3TCCM2Oa64= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624882645; 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=JThHZjDmtoJ05xjXnI9qkpc88vw9VyMzr0Wk62iv4t1QJ7TZBHZ12tz8dVZ3j7voDAGI1zxjxfA/YbBbEVibMNIfP/11YeGlEq58RroRwtBD7dra1OJD12rsY6lpE0uyPYwN1lURV66DZwzTk46RJB+aJiJO1WTkSvn/N4MmO1s= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162488264473313.408526754674881; Mon, 28 Jun 2021 05:17:24 -0700 (PDT) Received: from localhost ([::1]:59488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxqCZ-0007VF-NI for importer@patchew.org; Mon, 28 Jun 2021 08:17:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxq7i-0006uf-3C; Mon, 28 Jun 2021 08:12:22 -0400 Received: from mail-eopbgr10131.outbound.protection.outlook.com ([40.107.1.131]:39798 helo=EUR02-HE1-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 1lxq7d-0004eW-BP; Mon, 28 Jun 2021 08:12:21 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1652.eurprd08.prod.outlook.com (2603:10a6:203:3c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.23; Mon, 28 Jun 2021 12:12:05 +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.4264.026; Mon, 28 Jun 2021 12:12:05 +0000 Received: from localhost.localdomain (185.215.60.221) by HE1P190CA0036.EURP190.PROD.OUTLOOK.COM (2603:10a6:7:52::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.18 via Frontend Transport; Mon, 28 Jun 2021 12:12:04 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QPzM7fIgUux3t4zn1WYosqWRUtM9Hdrr6gJkFkNW5lNgzhk4AJpi/BmcooKwXMoJD0/+mSIikjYPSG3OkbQioIgawdaNvcydEJi+NRr6Q+YgJSAE32SSMk4o5UWp6KZJyZ9t9rqKO/+ppI3ZS9xHCJiZdm2WL6fs/fp5hOWDDabo3iySPMSCbHgEUSOtlNrKFl4UqHrkwz/GwBk+immchSDehwaADe8SmwWivlRTp0slBRl1+ftb4tIVMF0V8U/22tPahvYMxabKpk91OC4bbd9BMnu4RoLsryMGTr/4QcDGh/uUI1th0BRVSA94ze+sVF8tacDcI8XCnX3L2eta/g== 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=ekrLGll4B1WrUf3B0yMfRzwe8TviJV/RYQvB8DqOPBNLGcB8egeuYmuFnQHxRB39ZjbZKSpWcWKTeuLwaVHGgZeRgKtUBTa+t8oLCmftxudJW8FiHVr8mLKiduPBxFgnO81wXIKyz6FwKCZ/tVC0EDC6GZuQd5I3bpsuWy7Yax9NsFEVdKluIonsLqtfq43M86mT9G3cxz4yazYxhZCm2xUkYhuS3XBQm1GxmSEXWWFaGugDOisnrsWEh3Xunp1wXRRDKW0ZQLBV0L4oOUCkpxSlc6SXEUzd9UJ+CHJ6VsscHkZOBnyTHHKP4hAhwwh0rxGEdloHNREXjMRZOcQ0Zw== 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=I3LuuJlTfWgG26jt6JTB0UKbaOhcEoLGsXb359LbdBxkiYUFUIF8fOB/WbixbRMF51xbXG9GL7gQrJVWMFXex0sVC5lcbiJUdEsJmezXK8V6JGL7YI0L/MzutH1gSy3lqTOHf75h/8qsOTYJ1r/YGRl394tC9fVgfT/Bp5rCVds= 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 v2 2/2] block/commit: use QEMU_AUTO_VFREE Date: Mon, 28 Jun 2021 15:11:33 +0300 Message-Id: <20210628121133.193984-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210628121133.193984-1-vsementsov@virtuozzo.com> References: <20210628121133.193984-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.221] X-ClientProxiedBy: HE1P190CA0036.EURP190.PROD.OUTLOOK.COM (2603:10a6:7:52::25) 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: 69e2d007-31ca-4816-4325-08d93a2df1a5 X-MS-TrafficTypeDiagnostic: AM5PR0801MB1652: 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: eIUxx+TXxyHmHpPfYImkUga4uUctrgMepEuWjPiDmTCU/HCyJsNnmHevZ9IWaUhC9cyW96BaNShEN35jdHIqtB+NherSKgpRkIedyVujjkNMIo6U74ENgBfvaSST3K1gDqWfo74ON7wtzvCfmP5SVfQpcn75EMpV7+IYJT7DldemxPLTBPdqrkY0WWpfEnvkFW40EHNaxPNlKdOOYM3cufL9WwZwaU0WgI2YTMcXHWfP5NJj/bMEgytuh3VSfHU2oz/lEOA06NGorCsona9+t7NTmGp8Ei/8A1b/49JGK3dXueeU/sawJETxQARWtIgK5G8fXZj4SiHTC98RjEnDb8CgFh8lV7hJedjwLmxBufs4xabzMXathG8p+iDeZUunviP/H28YgFVRJGYuGpzn4vyPC43uaYp0NwpNPSnjohGmlqAYvWsFRsHaFUwpLo6/wtlXI0+xOJfvSuP0TEPK1S9/lwgRjBsDHOxfHrP6+rIEdCbFkl87WvVditXkfk37rwpf5EF5Y2gdZemNgB7GL0A1zgDeslujHkrf+D9l2E1Uuv1kYum3vMynW9jPUcKhYMy1tp5JgoEqdnCKXAsrQVJExiC62vsMQhMyZ9QOf16QstncjW88hlOOJdhp8qp4a6LZ+QEVRjCZLBX63qiElVgmYF+nJDp2LBGMUaNVtZvligxpsY3e12JjIivbHeSl97BsxfZlnWWIPx6ZhW/7pH2ULg6hhX1VxeykFEXqnvSbL/y41F81WOFJhH+VyRQ+pqgk2sUWG5P6MC0dBmdTiw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(396003)(376002)(39840400004)(136003)(66556008)(66476007)(66946007)(186003)(16526019)(83380400001)(1076003)(6666004)(38100700002)(38350700002)(316002)(86362001)(8676002)(956004)(36756003)(6486002)(6512007)(8936002)(5660300002)(52116002)(6916009)(2906002)(26005)(2616005)(4326008)(6506007)(478600001)(69590400013)(84603001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hNvRYSjawC8A7+3xTHoedCFwmeQ0mHziRqVigpBXMbxaX4kVdbfzbMU5NujL?= =?us-ascii?Q?6WQqBPSjhSmCAJXNT6ivZMZ9n+eDZIc0OzZxpY1fdVIsM2dhZOYxaDmaiy0z?= =?us-ascii?Q?gNT+y8xJ6mABXMDR2vzpaUedixKsunVIhiZnveY8BbgXMwiXtQzN12kWlbSu?= =?us-ascii?Q?85ieGXS3HoHjckrPbKDnrsiXl2tyEvML53Bgde9yj5HRKxpQMbW3hrBZ7FKL?= =?us-ascii?Q?iaoNNAOzEFHDfC57zO/q0B4beJAIcFRn9t/mOs/4rr18bL4nYB0rvDbyuS8+?= =?us-ascii?Q?sJrOV4d9BidT8/CeXIhAjJBRy/Jzh8lvFxu50AxgNr/NPg2tvmH5EhZawyPq?= =?us-ascii?Q?Rym7nQrLtFrnJcFGEfVypCpBc6nG+/vovIpKX5JbX7qkADFWEutuPHhjIGnc?= =?us-ascii?Q?Em4Y9JY6kVIyDk0s0oFzkWY077Qjqh7b3yKy+OTYVGg9hz8+BF5qiM2hvbBm?= =?us-ascii?Q?cU2Y/ISd02ln/Bu9bdDvgJ8/ZId3OXuhmtcp1m3XqONbhKrBUwi5h3BrCm4R?= =?us-ascii?Q?vMCVJVWmxlHpTSvtm/dNWiOlvzhjUMTThB0bzSrlz9gztl4Uo4VbtE86l1tu?= =?us-ascii?Q?bdLwgZzEcH+5XHB2sbuuca9DzJoDTFcBLDFIjR6UdO9iDKryhrp4iENGkf1j?= =?us-ascii?Q?iAUDBQLxVzfBhmYSJPb+f3fRdlyrL1S5ksXVwc2k0bTteuvgeCFqY5v5gyRW?= =?us-ascii?Q?IWFQ1wdk80BdUDF6zCNZz4csFLvdUyLpFb9dQ4tLPQJStnEvntbqrAXKQtOP?= =?us-ascii?Q?ZulD+LP5ySPM7yxe8nrHhmlj+9+ZrVq5zQugUhb7k0xrHfSJodPawW2/aDUY?= =?us-ascii?Q?F/6LIEL/3726318ke8Ud5gepZV0ULgc5QBKs85hlKd0KkSzhlJaHG2v6BQXE?= =?us-ascii?Q?26ROFqp9EhEE6uKGhnU0ZalKuPsFeGve5Xdlf1QH4g7SPFgOKJBhk5bNvB3c?= =?us-ascii?Q?T0EBvusECYukFWTjx4C4wLgPxQCJOzKRfa0B0v9VhR4EdO1nnRpa41RdDX61?= =?us-ascii?Q?Qh/H/EOJ7pusuBkaCJt98FyaotWc15XV+nm+eyP5oWSk2pOD828nXYTOG0FA?= =?us-ascii?Q?cgNuihXhAXKlA2PMLIk2IbsKSrILF5uHRHK4Wl7JjSwWJRbvzZ9C1OJy3gAW?= =?us-ascii?Q?op0deQveAofdWwWzwJa205IwutE6mqAHYSnejgVWwD4Em/LHSu2qiwDhYqI5?= =?us-ascii?Q?srOGRCpmTa2OnrHrXxcPE3ahgvZl6lIn409meZDx/uZwn4EYfUVydwZ34Qat?= =?us-ascii?Q?UoYkmgH1ac7ZNEa2YQmGuXpDFR83bILT5gUw+4o4mqvBeaOKgt//q4pqIH7c?= =?us-ascii?Q?/X9rQFuhX3yu2+Csng6Vp0Pa?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69e2d007-31ca-4816-4325-08d93a2df1a5 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2021 12:12:05.2760 (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: YtYYYqLfrBf+Pd3XsTtRhSD05bS3k9TtLoQrhs6tWzQGpTPEpvc/5GbNVh01NmrX8PI8z+bPsRSRIAZN62mnMcuePBNoz35Y4119GVlVtT0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1652 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.1.131; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-HE1-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" Signed-off-by: Vladimir Sementsov-Ogievskiy --- 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