From patchwork Mon Jun 28 12:11:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12347861 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21DEBC2B9F4 for ; Mon, 28 Jun 2021 12:27:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BE1B561279 for ; Mon, 28 Jun 2021 12:27:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BE1B561279 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxqMP-0007su-NM for qemu-devel@archiver.kernel.org; Mon, 28 Jun 2021 08:27:33 -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 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; 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 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> 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 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 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: FLPCW2JrLb5QOzDfqtHNGBIK5OkQ3LaMCyke9KEe7GeWxRH81sobtEFuWCOZaIDhrPdeUhidLQU6hV62Q5ES5+vfjizUufOCvj3CVK7hEngsOJ8zzzLq+BxldzA9m54BW5wPrM6fLeUskH11sUAn2NZrkP4M5IVGycqe/GeM/pLAeWYXQv1Rf9ePEirtm9YkwYxlgGNy1NamkgOSys+rMeNYtBUuM5BgmTKUqPdcACWEZNfEeEAkguFdHEQJVqOT2yvhgWktFkSOLzDUi2PQCtMoXs/M2tgWyN9GxxYFAYOkmj0iLtcbhQWYgmzGi96iBgcOEIb6+Nx24SgBe4UMtB8pzUxga2QsuQRbbzdLBepIRKqZ4ZAOQH9Su+Uek5XGN8DQ7pZFRSuxP4BHzhR6C5Dwy0ETQCfpW67n/W08w0dssqW+lOkJOFctqG+b3T9Mw6Ed0zAaHSegM2i73eiyfhoSWcN143NmUQ1KTRaU/mjOoO9twtopFZZNFriQIf7fwRn0ljuEX5r76yMPayngg8wReG+nUnLZNMLWvsCstaMs592ZcheC421n1JIauIMfi7NLIpvr21ERjdL6vppWUN/qT/yE09qJvIXW+itn2SThb2Wq7IAZngcOfR4nAJ1aVzZSJrS2VDH63tfYUMbMV9eqLEomjShgZDcq2EIGg8W+2PHDVTPjzY2Iqst9+jhaVxNRDLQCzga6wOlTg5n5Oph7NG5Ek3JseCLcSAKDP/57hIU0MhDgkvW3dFYRgBSVkfXjyTXmDrFknRGpwPCObBShSQ8IRpkBucCjfp+5Eq2WvJfjdpZE1Lfv72CbnEsa0anwcJ9pBGBCNXJgs+fXdsVy3jYKRBeWgLaq7DvdlCZBqwFDNRMOBnwWAGR/BwnmgomE/G5DKjl1ehiAG7GsRfxijffOvwHF/9UbwWbU5D9y4AQ5O6im/LnQZoNbZYr+TTvBTgFRWA/ZUNoGxvjWso7FQTEUFuP3kpMliDV0ny47otaJwc83sla1D6d7bST0nhaju9EMInIH0iF95Q2vxHdr52LR0jAtEFB6fKeCSkDXQPWZ27PH75ihuw9znNlEADeUf2Sp9UniSwkkHdVVKJpkkf8KjDe25u6cCer4iaKJ+Ky77huwrNEJMAXW93Bjcxy20m6mHzzT15bxvjhUkGuDbtcNGYTvnsd611bwQl/YyGvfGj/Z1nd0Mg3CrWqH7BOqp2mv7Su3PivxaP0juqjHLTv+ewzGp6sQQiafwXVhaFZ4WGOYG2cpovdV5L0JsAsP0wOSrHjhh/EBjcDlBnYhA3KqyZ+YSkEKIHe2ooVemmCIJnTcawcjYnfbBj7O 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 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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); +/* + * It's an analog of GLIB's g_autoptr_cleanup_generic_gfree(), used to define + * g_autofree macro. + */ +static inline void qemu_cleanup_generic_vfree(void *p) +{ + void **pp = (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(). From patchwork Mon Jun 28 12:11:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12347845 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7963AC2B9F4 for ; Mon, 28 Jun 2021 12:17:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0192661C49 for ; Mon, 28 Jun 2021 12:17:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0192661C49 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxqCV-0007VF-4l for qemu-devel@archiver.kernel.org; Mon, 28 Jun 2021 08:17:19 -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 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; 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 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> 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 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 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: hNvRYSjawC8A7+3xTHoedCFwmeQ0mHziRqVigpBXMbxaX4kVdbfzbMU5NujL6WQqBPSjhSmCAJXNT6ivZMZ9n+eDZIc0OzZxpY1fdVIsM2dhZOYxaDmaiy0zgNT+y8xJ6mABXMDR2vzpaUedixKsunVIhiZnveY8BbgXMwiXtQzN12kWlbSu85ieGXS3HoHjckrPbKDnrsiXl2tyEvML53Bgde9yj5HRKxpQMbW3hrBZ7FKLiaoNNAOzEFHDfC57zO/q0B4beJAIcFRn9t/mOs/4rr18bL4nYB0rvDbyuS8+sJrOV4d9BidT8/CeXIhAjJBRy/Jzh8lvFxu50AxgNr/NPg2tvmH5EhZawyPqRym7nQrLtFrnJcFGEfVypCpBc6nG+/vovIpKX5JbX7qkADFWEutuPHhjIGncEm4Y9JY6kVIyDk0s0oFzkWY077Qjqh7b3yKy+OTYVGg9hz8+BF5qiM2hvbBmcU2Y/ISd02ln/Bu9bdDvgJ8/ZId3OXuhmtcp1m3XqONbhKrBUwi5h3BrCm4RvMCVJVWmxlHpTSvtm/dNWiOlvzhjUMTThB0bzSrlz9gztl4Uo4VbtE86l1tubdLwgZzEcH+5XHB2sbuuca9DzJoDTFcBLDFIjR6UdO9iDKryhrp4iENGkf1jiAUDBQLxVzfBhmYSJPb+f3fRdlyrL1S5ksXVwc2k0bTteuvgeCFqY5v5gyRWIWFQ1wdk80BdUDF6zCNZz4csFLvdUyLpFb9dQ4tLPQJStnEvntbqrAXKQtOPZulD+LP5ySPM7yxe8nrHhmlj+9+ZrVq5zQugUhb7k0xrHfSJodPawW2/aDUYF/6LIEL/3726318ke8Ud5gepZV0ULgc5QBKs85hlKd0KkSzhlJaHG2v6BQXE26ROFqp9EhEE6uKGhnU0ZalKuPsFeGve5Xdlf1QH4g7SPFgOKJBhk5bNvB3cT0EBvusECYukFWTjx4C4wLgPxQCJOzKRfa0B0v9VhR4EdO1nnRpa41RdDX61Qh/H/EOJ7pusuBkaCJt98FyaotWc15XV+nm+eyP5oWSk2pOD828nXYTOG0FAcgNuihXhAXKlA2PMLIk2IbsKSrILF5uHRHK4Wl7JjSwWJRbvzZ9C1OJy3gAWop0deQveAofdWwWzwJa205IwutE6mqAHYSnejgVWwD4Em/LHSu2qiwDhYqI5srOGRCpmTa2OnrHrXxcPE3ahgvZl6lIn409meZDx/uZwn4EYfUVydwZ34QatUoYkmgH1ac7ZNEa2YQmGuXpDFR83bILT5gUw+4o4mqvBeaOKgt//q4pqIH7c/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 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 = 0; int ret = 0; int64_t n = 0; /* bytes */ - void *buf = NULL; + QEMU_AUTO_VFREE void *buf = NULL; int64_t len, base_len; - ret = len = blk_getlength(s->top); + len = blk_getlength(s->top); if (len < 0) { - goto out; + return len; } job_progress_set_remaining(&s->common.job, len); - ret = base_len = blk_getlength(s->base); + base_len = blk_getlength(s->base); if (base_len < 0) { - goto out; + return base_len; } if (base_len < len) { ret = blk_truncate(s->base, len, false, PREALLOC_MODE_OFF, 0, NULL); if (ret) { - goto out; + return ret; } } @@ -174,7 +174,7 @@ static int coroutine_fn commit_run(Job *job, Error **errp) block_job_error_action(&s->common, s->on_error, error_in_source, -ret); if (action == BLOCK_ERROR_ACTION_REPORT) { - goto out; + return ret; } else { n = 0; continue; @@ -190,12 +190,7 @@ static int coroutine_fn commit_run(Job *job, Error **errp) } } - ret = 0; - -out: - qemu_vfree(buf); - - return ret; + return 0; } static const BlockJobDriver commit_job_driver = { @@ -435,7 +430,7 @@ int bdrv_commit(BlockDriverState *bs) int ro; int64_t n; int ret = 0; - uint8_t *buf = NULL; + QEMU_AUTO_VFREE uint8_t *buf = NULL; Error *local_err = NULL; if (!drv) @@ -556,8 +551,6 @@ int bdrv_commit(BlockDriverState *bs) ret = 0; ro_cleanup: - qemu_vfree(buf); - blk_unref(backing); if (bdrv_cow_bs(bs) != backing_file_bs) { bdrv_set_backing_hd(bs, backing_file_bs, &error_abort);