From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, 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 72B73C2BB1D for ; Thu, 12 Mar 2020 09:00:57 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 4CA6920716 for ; Thu, 12 Mar 2020 09:00:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4CA6920716 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jCJhm-0000iQ-Ep; Thu, 12 Mar 2020 09:00:38 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jCJhl-0000i2-5w for xen-devel@lists.xenproject.org; Thu, 12 Mar 2020 09:00:37 +0000 X-Inumbo-ID: ebeade60-643f-11ea-92cf-bc764e2007e4 Received: from relay.sw.ru (unknown [185.231.240.75]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ebeade60-643f-11ea-92cf-bc764e2007e4; Thu, 12 Mar 2020 09:00:29 +0000 (UTC) Received: from vovaso.qa.sw.ru ([10.94.3.0] helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1jCJgt-0004Ve-Hl; Thu, 12 Mar 2020 11:59:43 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Date: Thu, 12 Mar 2020 11:59:28 +0300 Message-Id: <20200312085936.9552-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200312085936.9552-1-vsementsov@virtuozzo.com> References: <20200312085936.9552-1-vsementsov@virtuozzo.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v9 02/10] scripts: Coccinelle script to use ERRP_AUTO_PROPAGATE() X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , vsementsov@virtuozzo.com, Laszlo Ersek , qemu-block@nongnu.org, Paul Durrant , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Christian Schoenebeck , Greg Kurz , armbru@redhat.com, Stefano Stabellini , Gerd Hoffmann , Stefan Hajnoczi , Anthony Perard , xen-devel@lists.xenproject.org, Max Reitz , Eric Blake , Michael Roth , Stefan Berger Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" U2NyaXB0IGFkZHMgRVJSUF9BVVRPX1BST1BBR0FURSBtYWNybyBpbnZvY2F0aW9uIHdoZXJlIGFw cHJvcHJpYXRlIGFuZApkb2VzIGNvcnJlc3BvbmRpbmcgY2hhbmdlcyBpbiBjb2RlIChsb29rIGZv ciBkZXRhaWxzIGluCmluY2x1ZGUvcWFwaS9lcnJvci5oKQoKVXNhZ2UgZXhhbXBsZToKc3BhdGNo IC0tc3AtZmlsZSBzY3JpcHRzL2NvY2NpbmVsbGUvYXV0by1wcm9wYWdhdGVkLWVycnAuY29jY2kg XAogLS1tYWNyby1maWxlIHNjcmlwdHMvY29jY2ktbWFjcm8tZmlsZS5oIC0taW4tcGxhY2UgLS1u by1zaG93LWRpZmYgXAogLS1tYXgtd2lkdGggODAgRklMRVMuLi4KClNpZ25lZC1vZmYtYnk6IFZs YWRpbWlyIFNlbWVudHNvdi1PZ2lldnNraXkgPHZzZW1lbnRzb3ZAdmlydHVvenpvLmNvbT4KLS0t CgpDYzogRXJpYyBCbGFrZSA8ZWJsYWtlQHJlZGhhdC5jb20+CkNjOiBLZXZpbiBXb2xmIDxrd29s ZkByZWRoYXQuY29tPgpDYzogTWF4IFJlaXR6IDxtcmVpdHpAcmVkaGF0LmNvbT4KQ2M6IEdyZWcg S3VyeiA8Z3JvdWdAa2FvZC5vcmc+CkNjOiBDaHJpc3RpYW4gU2Nob2VuZWJlY2sgPHFlbXVfb3Nz QGNydWRlYnl0ZS5jb20+CkNjOiBTdGVmYW5vIFN0YWJlbGxpbmkgPHNzdGFiZWxsaW5pQGtlcm5l bC5vcmc+CkNjOiBBbnRob255IFBlcmFyZCA8YW50aG9ueS5wZXJhcmRAY2l0cml4LmNvbT4KQ2M6 IFBhdWwgRHVycmFudCA8cGF1bEB4ZW4ub3JnPgpDYzogU3RlZmFuIEhham5vY3ppIDxzdGVmYW5o YUByZWRoYXQuY29tPgpDYzogIlBoaWxpcHBlIE1hdGhpZXUtRGF1ZMOpIiA8cGhpbG1kQHJlZGhh dC5jb20+CkNjOiBMYXN6bG8gRXJzZWsgPGxlcnNla0ByZWRoYXQuY29tPgpDYzogR2VyZCBIb2Zm bWFubiA8a3JheGVsQHJlZGhhdC5jb20+CkNjOiBTdGVmYW4gQmVyZ2VyIDxzdGVmYW5iQGxpbnV4 LmlibS5jb20+CkNjOiBNYXJrdXMgQXJtYnJ1c3RlciA8YXJtYnJ1QHJlZGhhdC5jb20+CkNjOiBN aWNoYWVsIFJvdGggPG1kcm90aEBsaW51eC52bmV0LmlibS5jb20+CkNjOiBxZW11LWRldmVsQG5v bmdudS5vcmcKQ2M6IHFlbXUtYmxvY2tAbm9uZ251Lm9yZwpDYzogeGVuLWRldmVsQGxpc3RzLnhl bnByb2plY3Qub3JnCgogc2NyaXB0cy9jb2NjaW5lbGxlL2F1dG8tcHJvcGFnYXRlZC1lcnJwLmNv Y2NpIHwgMzI3ICsrKysrKysrKysrKysrKysrKwogaW5jbHVkZS9xYXBpL2Vycm9yLmggICAgICAg ICAgICAgICAgICAgICAgICAgIHwgICAzICsKIE1BSU5UQUlORVJTICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB8ICAgMSArCiAzIGZpbGVzIGNoYW5nZWQsIDMzMSBpbnNlcnRpb25z KCspCiBjcmVhdGUgbW9kZSAxMDA2NDQgc2NyaXB0cy9jb2NjaW5lbGxlL2F1dG8tcHJvcGFnYXRl ZC1lcnJwLmNvY2NpCgpkaWZmIC0tZ2l0IGEvc2NyaXB0cy9jb2NjaW5lbGxlL2F1dG8tcHJvcGFn YXRlZC1lcnJwLmNvY2NpIGIvc2NyaXB0cy9jb2NjaW5lbGxlL2F1dG8tcHJvcGFnYXRlZC1lcnJw LmNvY2NpCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAuLjdkYWMyZGNmYTQK LS0tIC9kZXYvbnVsbAorKysgYi9zY3JpcHRzL2NvY2NpbmVsbGUvYXV0by1wcm9wYWdhdGVkLWVy cnAuY29jY2kKQEAgLTAsMCArMSwzMjcgQEAKKy8vIFVzZSBFUlJQX0FVVE9fUFJPUEFHQVRFIChz ZWUgaW5jbHVkZS9xYXBpL2Vycm9yLmgpCisvLworLy8gQ29weXJpZ2h0IChjKSAyMDIwIFZpcnR1 b3p6byBJbnRlcm5hdGlvbmFsIEdtYkguCisvLworLy8gVGhpcyBwcm9ncmFtIGlzIGZyZWUgc29m dHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgorLy8gbW9kaWZ5IGl0IHVuZGVy IHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgYXMKKy8vIHB1Ymxp c2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIgdmVyc2lvbiAyIG9m IHRoZQorLy8gTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4K Ky8vCisvLyBUaGlzIHByb2dyYW0gaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3 aWxsIGJlIHVzZWZ1bCwKKy8vIGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVu IHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCisvLyBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBG T1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlCisvLyBHTlUgR2VuZXJhbCBQdWJsaWMg TGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorLy8KKy8vIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZl ZCBhIGNvcHkgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCisvLyBhbG9uZyB3aXRo IHRoaXMgcHJvZ3JhbS4gIElmIG5vdCwgc2VlCisvLyA8aHR0cDovL3d3dy5nbnUub3JnL2xpY2Vu c2VzLz4uCisvLworLy8gVXNhZ2UgZXhhbXBsZToKKy8vIHNwYXRjaCAtLXNwLWZpbGUgc2NyaXB0 cy9jb2NjaW5lbGxlL2F1dG8tcHJvcGFnYXRlZC1lcnJwLmNvY2NpIFwKKy8vICAtLW1hY3JvLWZp bGUgc2NyaXB0cy9jb2NjaS1tYWNyby1maWxlLmggLS1pbi1wbGFjZSBcCisvLyAgLS1uby1zaG93 LWRpZmYgLS1tYXgtd2lkdGggODAgRklMRVMuLi4KKy8vCisvLyBOb3RlOiAtLW1heC13aWR0aCA4 MCBpcyBuZWVkZWQgYmVjYXVzZSBjb2NjaW5lbGxlIGRlZmF1bHQgaXMgbGVzcworLy8gdGhhbiA4 MCwgYW5kIHdpdGhvdXQgdGhpcyBwYXJhbWV0ZXIgY29jY2luZWxsZSBtYXkgcmVpbmRlbnQgc29t ZQorLy8gbGluZXMgd2hpY2ggZml0IGludG8gODAgY2hhcmFjdGVycyBidXQgbm90IHRvIGNvY2Np bmVsbGUgZGVmYXVsdCwKKy8vIHdoaWNoIGluIHR1cm4gcHJvZHVjZXMgZXh0cmEgcGF0Y2ggaHVu a3MgZm9yIG5vIHJlYXNvbi4KKworLy8gU3dpdGNoIHVudXN1YWwgRXJyb3IgKiogcGFyYW1ldGVy IG5hbWVzIHRvIGVycnAKKy8vICh0aGlzIGlzIG5lY2Vzc2FyeSB0byB1c2UgRVJSUF9BVVRPX1BS T1BBR0FURSkuCisvLworLy8gRGlzYWJsZSBvcHRpb25hbF9xdWFsaWZpZXIgdG8gc2tpcCBmdW5j dGlvbnMgd2l0aAorLy8gIkVycm9yICpjb25zdCAqZXJycCIgcGFyYW1ldGVyLgorLy8KKy8vIFNr aXAgZnVuY3Rpb25zIHdpdGggImFzc2VydChfZXJycCAmJiAqX2VycnApIiBzdGF0ZW1lbnQsIGJl Y2F1c2UKKy8vIHRoYXQgc2lnbmFscyB1bnVzdWFsIHNlbWFudGljcywgYW5kIHRoZSBwYXJhbWV0 ZXIgbmFtZSBtYXkgd2VsbAorLy8gc2VydmUgYSBwdXJwb3NlLiAobGlrZSBuYmRfaXRlcl9jaGFu bmVsX2Vycm9yKCkpLgorLy8KKy8vIFNraXAgdXRpbC9lcnJvci5jIHRvIG5vdCB0b3VjaCwgZm9y IGV4YW1wbGUsIGVycm9yX3Byb3BhZ2F0ZSgpIGFuZAorLy8gZXJyb3JfcHJvcGFnYXRlX3ByZXBl bmQoKS4KK0AgZGVwZW5kcyBvbiAhKGZpbGUgaW4gInV0aWwvZXJyb3IuYyIpIGRpc2FibGUgb3B0 aW9uYWxfcXVhbGlmaWVyQAoraWRlbnRpZmllciBmbjsKK2lkZW50aWZpZXIgX2VycnAgIT0gZXJy cDsKK0BACisKKyBmbiguLi4sCistICAgRXJyb3IgKipfZXJycAorKyAgIEVycm9yICoqZXJycAor ICAgICwuLi4pCisgeworKAorICAgICAuLi4gd2hlbiAhPSBhc3NlcnQoX2VycnAgJiYgKl9lcnJw KQorJgorICAgICA8Li4uCistICAgIF9lcnJwCisrICAgIGVycnAKKyAgICAgLi4uPgorKQorIH0K KworLy8gQWRkIGludm9jYXRpb24gb2YgRVJSUF9BVVRPX1BST1BBR0FURSB0byBlcnJwLWZ1bmN0 aW9ucyB3aGVyZQorLy8gbmVjZXNzYXJ5CisvLworLy8gTm90ZSwgdGhhdCB3aXRob3V0ICJ3aGVu IGFueSIgdGhlIGZpbmFsICIuLi4iIGRvZXMgbm90IG1hY2gKKy8vIHNvbWV0aGluZyBtYXRjaGVk IGJ5IHByZXZpb3VzIHBhdHRlcm4sIGkuZS4gdGhlIHJ1bGUgd2lsbCBub3QgbWF0Y2gKKy8vIGRv dWJsZSBlcnJvcl9wcmVwZW5kIGluIGNvbnRyb2wgZmxvdyBsaWtlIGluCisvLyB2ZmlvX3NldF9p cnFfc2lnbmFsaW5nKCkuCisvLworLy8gTm90ZSwgImV4aXN0cyIgc2F5cyB0aGF0IHdlIHdhbnQg YXBwbHkgcnVsZSBldmVuIGlmIGl0IG1hdGNoZXMgbm90CisvLyBvbiBhbGwgcG9zc2libGUgY29u dHJvbCBmbG93cyAob3RoZXJ3aXNlLCBpdCB3aWxsIG5vdCBtYXRjaAorLy8gc3RhbmRhcmQgcGF0 dGVybiB3aGVuIGVycm9yX3Byb3BhZ2F0ZSgpIGNhbGwgaXMgaW4gaWYgYnJhbmNoKS4KK0AgZGlz YWJsZSBvcHRpb25hbF9xdWFsaWZpZXIgZXhpc3RzQAoraWRlbnRpZmllciBmbiwgbG9jYWxfZXJy Oworc3ltYm9sIGVycnA7CitAQAorCisgZm4oLi4uLCBFcnJvciAqKmVycnAsIC4uLikKKyB7Cisr ICAgRVJSUF9BVVRPX1BST1BBR0FURSgpOworICAgIC4uLiAgd2hlbiAhPSBFUlJQX0FVVE9fUFJP UEFHQVRFKCk7CisoCisoCisgICAgZXJyb3JfYXBwZW5kX2hpbnQoZXJycCwgLi4uKTsKK3wKKyAg ICBlcnJvcl9wcmVwZW5kKGVycnAsIC4uLik7Cit8CisgICAgZXJyb3JfdnByZXBlbmQoZXJycCwg Li4uKTsKKykKKyAgICAuLi4gd2hlbiBhbnkKK3wKKyAgICBFcnJvciAqbG9jYWxfZXJyID0gTlVM TDsKKyAgICAuLi4KKygKKyAgICBlcnJvcl9wcm9wYWdhdGVfcHJlcGVuZChlcnJwLCBsb2NhbF9l cnIsIC4uLik7Cit8CisgICAgZXJyb3JfcHJvcGFnYXRlKGVycnAsIGxvY2FsX2Vycik7CispCisg ICAgLi4uCispCisgfQorCisKKy8vIE1hdGNoIGZ1bmN0aW9ucyB3aXRoIHByb3BhZ2F0aW9uIG9m IGxvY2FsIGVycm9yIHRvIGVycnAuCisvLyBXZSB3YW50IHRvIHJlZmVyIHRoZXNlIGZ1bmN0aW9u cyBpbiBzZXZlcmFsIGZvbGxvd2luZyBydWxlcywgYnV0IEkKKy8vIGRvbid0IGtub3cgYSBwcm9w ZXIgd2F5IHRvIGluaGVyaXQgYSBmdW5jdGlvbiwgbm90IGp1c3QgaXRzIG5hbWUKKy8vICh0byBu b3QgbWF0Y2ggYW5vdGhlciBmdW5jdGlvbnMgd2l0aCBzYW1lIG5hbWUgaW4gZm9sbG93aW5nIHJ1 bGVzKS4KKy8vIE5vdC1wcm9wZXIgd2F5IGlzIGFzIGZvbGxvd3M6IHJlbmFtZSBlcnJwIHBhcmFt ZXRlciBpbiBmdW5jdGlvbnMKKy8vIGhlYWRlciBhbmQgbWF0Y2ggaXQgaW4gZm9sbG93aW5nIHJ1 bGVzLiBSZW5hbWUgaXQgYmFjayBhZnRlciBhbGwKKy8vIHRyYW5zZm9ybWF0aW9ucy4KKy8vCisv LyBUaGUgc2ltcGxlc3QgY2FzZSBvZiBwcm9wYWdhdGlvbiBzY2hlbWUgaXMgc2luZ2xlIGRlZmlu aXRpb24gb2YKKy8vIGxvY2FsX2VyciB3aXRoIGF0IG1vc3Qgb25lIGVycm9yX3Byb3BhZ2F0ZV9w cmVwZW5kIG9yCisvLyBlcnJvcl9wcm9wYWdhdGUgb24gZWFjaCBjb250cm9sLWZsb3cuIFN0aWxs LCB3ZSB3YW50IHRvIG1hdGNoIG1vcmUKKy8vIGNvbXBsZXggc2NoZW1lcyB0b28uIFdlJ2xsIHdh cm4gdGhlbSB3aXRoIGhlbHAgb2YgZnVydGhlciBydWxlcy4KK0BydWxlMSBkaXNhYmxlIG9wdGlv bmFsX3F1YWxpZmllciBleGlzdHNACitpZGVudGlmaWVyIGZuLCBsb2NhbF9lcnI7CitzeW1ib2wg ZXJycDsKK0BACisKKyBmbiguLi4sIEVycm9yICoqCistICAgIGVycnAKKysgICAgX19fXworICAg ICwgLi4uKQorIHsKKyAgICAgLi4uCisgICAgIEVycm9yICpsb2NhbF9lcnIgPSBOVUxMOworICAg ICAuLi4KKygKKyAgICAgZXJyb3JfcHJvcGFnYXRlX3ByZXBlbmQoZXJycCwgbG9jYWxfZXJyLCAu Li4pOworfAorICAgICBlcnJvcl9wcm9wYWdhdGUoZXJycCwgbG9jYWxfZXJyKTsKKykKKyAgICAg Li4uCisgfQorCisKKy8vIFdhcm4gc2V2ZXJhbCBFcnJvciAqIGRlZmluaXRpb25zLgorQGNoZWNr MSBkaXNhYmxlIG9wdGlvbmFsX3F1YWxpZmllciBleGlzdHNACitpZGVudGlmaWVyIGZuID0gcnVs ZTEuZm4sIGxvY2FsX2VyciwgbG9jYWxfZXJyMjsKK0BACisKKyBmbiguLi4sIEVycm9yICoqIF9f X18sIC4uLikKKyB7CisgICAgIC4uLgorICAgICBFcnJvciAqbG9jYWxfZXJyID0gTlVMTDsKKyAg ICAgLi4uIHdoZW4gYW55CisgICAgIEVycm9yICpsb2NhbF9lcnIyID0gTlVMTDsKKyAgICAgLi4u IHdoZW4gYW55CisgfQorCitAIHNjcmlwdDpweXRob24gQAorZm4gPDwgY2hlY2sxLmZuOworQEAK KworcHJpbnQoJ1dhcm5pbmc6IGZ1bmN0aW9uIHt9IGhhcyBzZXZlcmFsIGRlZmluaXRpb25zIG9m ICcKKyAgICAgICdFcnJvciAqIGxvY2FsIHZhcmlhYmxlJy5mb3JtYXQoZm4pKQorCisvLyBXYXJu IHNldmVyYWwgcHJvcGFnYXRpb25zIGluIGNvbnRyb2wgZmxvdy4KK0BjaGVjazIgZGlzYWJsZSBv cHRpb25hbF9xdWFsaWZpZXIgZXhpc3RzQAoraWRlbnRpZmllciBmbiA9IHJ1bGUxLmZuOworc3lt Ym9sIGVycnA7Citwb3NpdGlvbiBwMSwgcDI7CitAQAorCisgZm4oLi4uLCBFcnJvciAqKiBfX19f LCAuLi4pCisgeworICAgICAuLi4KKygKKyAgICAgZXJyb3JfcHJvcGFnYXRlX3ByZXBlbmQoZXJy cCwgLi4uKTtAcDEKK3wKKyAgICAgZXJyb3JfcHJvcGFnYXRlKGVycnAsIC4uLik7QHAxCispCisg ICAgIC4uLgorKAorICAgICBlcnJvcl9wcm9wYWdhdGVfcHJlcGVuZChlcnJwLCAuLi4pO0BwMgor fAorICAgICBlcnJvcl9wcm9wYWdhdGUoZXJycCwgLi4uKTtAcDIKKykKKyAgICAgLi4uIHdoZW4g YW55CisgfQorCitAIHNjcmlwdDpweXRob24gQAorZm4gPDwgY2hlY2syLmZuOworcDEgPDwgY2hl Y2syLnAxOworcDIgPDwgY2hlY2syLnAyOworQEAKKworcHJpbnQoJ1dhcm5pbmc6IGZ1bmN0aW9u IHt9IHByb3BhZ2F0ZXMgdG8gZXJycCBzZXZlcmFsIHRpbWVzIGluICcKKyAgICAgICdvbmUgY29u dHJvbCBmbG93OiBhdCB7fTp7fSBhbmQgdGhlbiBhdCB7fTp7fScuZm9ybWF0KAorICAgICAgICAg IGZuLCBwMVswXS5maWxlLCBwMVswXS5saW5lLCBwMlswXS5maWxlLCBwMlswXS5saW5lKSkKKwor Ly8gQ29udmVydCBzcGVjaWFsIGNhc2Ugd2l0aCBnb3RvIHNlcGFyYXRlbHkuCisvLyBJIHRyaWVk IG1lcmdpbmcgdGhpcyBpbnRvIHRoZSBmb2xsb3dpbmcgcnVsZSB0aGUgb2J2aW91cyB3YXksIGJ1 dAorLy8gaXQgbWFkZSBDb2NjaW5lbGxlIGhhbmcgb24gYmxvY2suYworLy8KKy8vIE5vdGUgaW50 ZXJlc3RpbmcgdGhpbmc6IGlmIHdlIGRvbid0IGRvIGl0IGhlcmUsIGFuZCB0cnkgdG8gZml4dXAK Ky8vICJvdXQ6IH0iIHRoaW5ncyBsYXRlciBhZnRlciBhbGwgdHJhbnNmb3JtYXRpb25zICh0aGUg cnVsZSB3aWxsIGJlCisvLyB0aGUgc2FtZSwganVzdCB3aXRob3V0IGVycm9yX3Byb3BhZ2F0ZSgp IGNhbGwpLCBjb2NjaW5lbGxlIGZhaWxzIHRvCisvLyBtYXRjaCB0aGlzICJvdXQ6IH0iLgorQCBk aXNhYmxlIG9wdGlvbmFsX3F1YWxpZmllckAKK2lkZW50aWZpZXIgcnVsZTEuZm4sIHJ1bGUxLmxv Y2FsX2Vyciwgb3V0Oworc3ltYm9sIGVycnA7CitAQAorCisgZm4oLi4uLCBFcnJvciAqKiBfX19f LCAuLi4pCisgeworICAgICA8Li4uCistICAgIGdvdG8gb3V0OworKyAgICByZXR1cm47CisgICAg IC4uLj4KKy0gb3V0OgorLSAgICBlcnJvcl9wcm9wYWdhdGUoZXJycCwgbG9jYWxfZXJyKTsKKyB9 CisKKy8vIENvbnZlcnQgbW9zdCBvZiBsb2NhbF9lcnIgcmVsYXRlZCBzdHVmZi4KKy8vCisvLyBO b3RlLCB0aGF0IHdlIHVwZGF0ZSBldmVyeXRoaW5nIHJlbGF0ZWQgdG8gbWF0Y2hlZCBieSBydWxl MQorLy8gZnVuY3Rpb24gbmFtZSBhbmQgbG9jYWxfZXJyIG5hbWUuIFdlIG1heSBtYXRjaCBzb21l dGhpbmcgbm90CisvLyByZWxhdGVkIHRvIHRoZSBwYXR0ZXJuIG1hdGNoZWQgYnkgcnVsZTEuIEZv ciBleGFtcGxlLCBsb2NhbF9lcnIgbWF5CisvLyBiZSBkZWZpbmVkIHdpdGggdGhlIHNhbWUgbmFt ZSBpbiBkaWZmZXJlbnQgYmxvY2tzIGluc2lkZSBvbmUKKy8vIGZ1bmN0aW9uLCBhbmQgaW4gb25l IGJsb2NrIGZvbGxvdyB0aGUgcHJvcGFnYXRpb24gcGF0dGVybiBhbmQgaW4KKy8vIG90aGVyIGJs b2NrIGRvZXNuJ3QuIE9yIHdlIG1heSBoYXZlIHNldmVyYWwgZnVuY3Rpb25zIHdpdGggdGhlIHNh bWUKKy8vIG5hbWUgKGZvciBkaWZmZXJlbnQgY29uZmlndXJhdGlvbnMpLgorLy8KKy8vIE5vdGUg YWxzbyB0aGF0IGVycnAtY2xlYW5pbmcgZnVuY3Rpb25zCisvLyAgIGVycm9yX2ZyZWVfZXJycAor Ly8gICBlcnJvcl9yZXBvcnRfZXJycAorLy8gICBlcnJvcl9yZXBvcnRmX2VycnAKKy8vICAgd2Fy bl9yZXBvcnRfZXJycAorLy8gICB3YXJuX3JlcG9ydGZfZXJycAorLy8gYXJlIG5vdCB5ZXQgaW1w bGVtZW50ZWQuIFRoZXkgbXVzdCBjYWxsIGNvcnJlc3BvbmRpbmcgRXJyb3IqIC0KKy8vIGZyZWVp bmcgZnVuY3Rpb24gYW5kIHRoZW4gc2V0ICplcnJwIHRvIE5VTEwsIHRvIGF2b2lkIGZ1cnRoZXIK Ky8vIHByb3BhZ2F0aW9uIHRvIG9yaWdpbmFsIGVycnAgKGNvbnNpZGVyIEVSUlBfQVVUT19QUk9Q QUdBVEUgaW4gdXNlKS4KKy8vIEZvciBleGFtcGxlLCBlcnJvcl9mcmVlX2VycnAgbWF5IGxvb2sg bGlrZSB0aGlzOgorLy8KKy8vICAgIHZvaWQgZXJyb3JfZnJlZV9lcnJwKEVycm9yICoqZXJycCkK Ky8vICAgIHsKKy8vICAgICAgICBlcnJvcl9mcmVlKCplcnJwKTsKKy8vICAgICAgICAqZXJycCA9 IE5VTEw7CisvLyAgICB9CitAIGRpc2FibGUgb3B0aW9uYWxfcXVhbGlmaWVyIGV4aXN0c0AKK2lk ZW50aWZpZXIgcnVsZTEuZm4sIHJ1bGUxLmxvY2FsX2VycjsKK2V4cHJlc3Npb24gbGlzdCBhcmdz Oworc3ltYm9sIGVycnA7CitAQAorCisgZm4oLi4uLCBFcnJvciAqKiBfX19fLCAuLi4pCisgewor ICAgICA8Li4uCisoCistICAgIEVycm9yICpsb2NhbF9lcnIgPSBOVUxMOworfAorCisvLyBDb252 ZXJ0IGVycm9yIGNsZWFyaW5nIGZ1bmN0aW9ucworKAorLSAgICBlcnJvcl9mcmVlKGxvY2FsX2Vy cik7CisrICAgIGVycm9yX2ZyZWVfZXJycChlcnJwKTsKK3wKKy0gICAgZXJyb3JfcmVwb3J0X2Vy cihsb2NhbF9lcnIpOworKyAgICBlcnJvcl9yZXBvcnRfZXJycChlcnJwKTsKK3wKKy0gICAgZXJy b3JfcmVwb3J0Zl9lcnIobG9jYWxfZXJyLCBhcmdzKTsKKysgICAgZXJyb3JfcmVwb3J0Zl9lcnJw KGVycnAsIGFyZ3MpOworfAorLSAgICB3YXJuX3JlcG9ydF9lcnIobG9jYWxfZXJyKTsKKysgICAg d2Fybl9yZXBvcnRfZXJycChlcnJwKTsKK3wKKy0gICAgd2Fybl9yZXBvcnRmX2Vycihsb2NhbF9l cnIsIGFyZ3MpOworKyAgICB3YXJuX3JlcG9ydGZfZXJycChlcnJwLCBhcmdzKTsKKykKKz8tICAg IGxvY2FsX2VyciA9IE5VTEw7CisKK3wKKy0gICAgZXJyb3JfcHJvcGFnYXRlX3ByZXBlbmQoZXJy cCwgbG9jYWxfZXJyLCBhcmdzKTsKKysgICAgZXJyb3JfcHJlcGVuZChlcnJwLCBhcmdzKTsKK3wK Ky0gICAgZXJyb3JfcHJvcGFnYXRlKGVycnAsIGxvY2FsX2Vycik7Cit8CistICAgICZsb2NhbF9l cnIKKysgICAgZXJycAorKQorICAgICAuLi4+CisgfQorCisvLyBDb252ZXJ0IHJlbWFpbmluZyBs b2NhbF9lcnIgdXNhZ2UuIEZvciBleGFtcGxlLCBkaWZmZXJlbnQga2luZHMgb2YKKy8vIGVycm9y IGNoZWNraW5nIGluIGlmIGNvbmRpdGlvbmFscy4gV2UgY2FuJ3QgbWVyZ2UgdGhpcyBpbnRvCisv LyBwcmV2aW91cyBodW5rLCBhcyB0aGlzIGNvbmZsaWN0cyB3aXRoIG90aGVyIHN1YnN0aXR1dGlv bnMgaW4gaXQgKGF0CisvLyBsZWFzdCB3aXRoICItIGxvY2FsX2VyciA9IE5VTEwiKS4KK0AgZGlz YWJsZSBvcHRpb25hbF9xdWFsaWZpZXJACitpZGVudGlmaWVyIHJ1bGUxLmZuLCBydWxlMS5sb2Nh bF9lcnI7CitzeW1ib2wgZXJycDsKK0BACisKKyBmbiguLi4sIEVycm9yICoqIF9fX18sIC4uLikK KyB7CisgICAgIDwuLi4KKy0gICAgbG9jYWxfZXJyCisrICAgICplcnJwCisgICAgIC4uLj4KKyB9 CisKKy8vIEFsd2F5cyB1c2UgdGhlIHNhbWUgcGF0dGVybiBmb3IgY2hlY2tpbmcgZXJyb3IKK0Ag ZGlzYWJsZSBvcHRpb25hbF9xdWFsaWZpZXJACitpZGVudGlmaWVyIHJ1bGUxLmZuOworc3ltYm9s IGVycnA7CitAQAorCisgZm4oLi4uLCBFcnJvciAqKiBfX19fLCAuLi4pCisgeworICAgICA8Li4u CistICAgICplcnJwICE9IE5VTEwKKysgICAgKmVycnAKKyAgICAgLi4uPgorIH0KKworLy8gUmV2 ZXJ0IHRlbXBvcmFyeSBfX18gaWRlbnRpZmllci4KK0AgZGlzYWJsZSBvcHRpb25hbF9xdWFsaWZp ZXJACitpZGVudGlmaWVyIHJ1bGUxLmZuOworQEAKKworIGZuKC4uLiwgRXJyb3IgKioKKy0gICBf X19fCisrICAgZXJycAorICAgICwgLi4uKQorIHsKKyAgICAgLi4uCisgfQpkaWZmIC0tZ2l0IGEv aW5jbHVkZS9xYXBpL2Vycm9yLmggYi9pbmNsdWRlL3FhcGkvZXJyb3IuaAppbmRleCAzMDE0MGQ5 YmZlLi41NmMxMzM1MjBkIDEwMDY0NAotLS0gYS9pbmNsdWRlL3FhcGkvZXJyb3IuaAorKysgYi9p bmNsdWRlL3FhcGkvZXJyb3IuaApAQCAtMjE0LDYgKzIxNCw5IEBACiAgKiAgICAgICAgIH0KICAq ICAgICAgICAgLi4uCiAgKiAgICAgfQorICoKKyAqIEZvciBtYXNzLWNvbnZlcnNpb24gdXNlIHNj cmlwdAorICogICBzY3JpcHRzL2NvY2NpbmVsbGUvYXV0by1wcm9wYWdhdGVkLWVycnAuY29jY2kK ICAqLwogCiAjaWZuZGVmIEVSUk9SX0gKZGlmZiAtLWdpdCBhL01BSU5UQUlORVJTIGIvTUFJTlRB SU5FUlMKaW5kZXggODU3Zjk2OWFhMS4uMDQ3ZjFiOTcxNCAxMDA2NDQKLS0tIGEvTUFJTlRBSU5F UlMKKysrIGIvTUFJTlRBSU5FUlMKQEAgLTE5OTgsNiArMTk5OCw3IEBAIEY6IGluY2x1ZGUvcWVt dS9lcnJvci1yZXBvcnQuaAogRjogcWFwaS9lcnJvci5qc29uCiBGOiB1dGlsL2Vycm9yLmMKIEY6 IHV0aWwvcWVtdS1lcnJvci5jCitGOiBzY3JpcHRzL2NvY2NpbmVsbGUvKmVyciouY29jY2kKIAog R0RCIHN0dWIKIE06IEFsZXggQmVubsOpZSA8YWxleC5iZW5uZWVAbGluYXJvLm9yZz4KLS0gCjIu MjEuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhl bi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBz Oi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, 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 30F70C2BB1D for ; Thu, 12 Mar 2020 09:05:03 +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 F0AD5206F1 for ; Thu, 12 Mar 2020 09:05:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F0AD5206F1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none 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]:37998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCJm1-00081q-Sy for qemu-devel@archiver.kernel.org; Thu, 12 Mar 2020 05:05:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51631) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCJhI-00074U-5a for qemu-devel@nongnu.org; Thu, 12 Mar 2020 05:00:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCJhB-0004sD-R0 for qemu-devel@nongnu.org; Thu, 12 Mar 2020 05:00:08 -0400 Received: from relay.sw.ru ([185.231.240.75]:48462) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jCJhB-0004qg-GO for qemu-devel@nongnu.org; Thu, 12 Mar 2020 05:00:01 -0400 Received: from vovaso.qa.sw.ru ([10.94.3.0] helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1jCJgt-0004Ve-Hl; Thu, 12 Mar 2020 11:59:43 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [PATCH v9 02/10] scripts: Coccinelle script to use ERRP_AUTO_PROPAGATE() Date: Thu, 12 Mar 2020 11:59:28 +0300 Message-Id: <20200312085936.9552-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200312085936.9552-1-vsementsov@virtuozzo.com> References: <20200312085936.9552-1-vsementsov@virtuozzo.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 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: , Cc: Kevin Wolf , vsementsov@virtuozzo.com, Laszlo Ersek , qemu-block@nongnu.org, Paul Durrant , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Christian Schoenebeck , Greg Kurz , armbru@redhat.com, Stefano Stabellini , Gerd Hoffmann , Stefan Hajnoczi , Anthony Perard , xen-devel@lists.xenproject.org, Max Reitz , Michael Roth , Stefan Berger Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Script adds ERRP_AUTO_PROPAGATE macro invocation where appropriate and does corresponding changes in code (look for details in include/qapi/error.h) Usage example: spatch --sp-file scripts/coccinelle/auto-propagated-errp.cocci \ --macro-file scripts/cocci-macro-file.h --in-place --no-show-diff \ --max-width 80 FILES... Signed-off-by: Vladimir Sementsov-Ogievskiy --- Cc: Eric Blake Cc: Kevin Wolf Cc: Max Reitz Cc: Greg Kurz Cc: Christian Schoenebeck Cc: Stefano Stabellini Cc: Anthony Perard Cc: Paul Durrant Cc: Stefan Hajnoczi Cc: "Philippe Mathieu-Daudé" Cc: Laszlo Ersek Cc: Gerd Hoffmann Cc: Stefan Berger Cc: Markus Armbruster Cc: Michael Roth Cc: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org Cc: xen-devel@lists.xenproject.org scripts/coccinelle/auto-propagated-errp.cocci | 327 ++++++++++++++++++ include/qapi/error.h | 3 + MAINTAINERS | 1 + 3 files changed, 331 insertions(+) create mode 100644 scripts/coccinelle/auto-propagated-errp.cocci diff --git a/scripts/coccinelle/auto-propagated-errp.cocci b/scripts/coccinelle/auto-propagated-errp.cocci new file mode 100644 index 0000000000..7dac2dcfa4 --- /dev/null +++ b/scripts/coccinelle/auto-propagated-errp.cocci @@ -0,0 +1,327 @@ +// Use ERRP_AUTO_PROPAGATE (see include/qapi/error.h) +// +// Copyright (c) 2020 Virtuozzo International GmbH. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License as +// published by the Free Software Foundation; either version 2 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see +// . +// +// Usage example: +// spatch --sp-file scripts/coccinelle/auto-propagated-errp.cocci \ +// --macro-file scripts/cocci-macro-file.h --in-place \ +// --no-show-diff --max-width 80 FILES... +// +// Note: --max-width 80 is needed because coccinelle default is less +// than 80, and without this parameter coccinelle may reindent some +// lines which fit into 80 characters but not to coccinelle default, +// which in turn produces extra patch hunks for no reason. + +// Switch unusual Error ** parameter names to errp +// (this is necessary to use ERRP_AUTO_PROPAGATE). +// +// Disable optional_qualifier to skip functions with +// "Error *const *errp" parameter. +// +// Skip functions with "assert(_errp && *_errp)" statement, because +// that signals unusual semantics, and the parameter name may well +// serve a purpose. (like nbd_iter_channel_error()). +// +// Skip util/error.c to not touch, for example, error_propagate() and +// error_propagate_prepend(). +@ depends on !(file in "util/error.c") disable optional_qualifier@ +identifier fn; +identifier _errp != errp; +@@ + + fn(..., +- Error **_errp ++ Error **errp + ,...) + { +( + ... when != assert(_errp && *_errp) +& + <... +- _errp ++ errp + ...> +) + } + +// Add invocation of ERRP_AUTO_PROPAGATE to errp-functions where +// necessary +// +// Note, that without "when any" the final "..." does not mach +// something matched by previous pattern, i.e. the rule will not match +// double error_prepend in control flow like in +// vfio_set_irq_signaling(). +// +// Note, "exists" says that we want apply rule even if it matches not +// on all possible control flows (otherwise, it will not match +// standard pattern when error_propagate() call is in if branch). +@ disable optional_qualifier exists@ +identifier fn, local_err; +symbol errp; +@@ + + fn(..., Error **errp, ...) + { ++ ERRP_AUTO_PROPAGATE(); + ... when != ERRP_AUTO_PROPAGATE(); +( +( + error_append_hint(errp, ...); +| + error_prepend(errp, ...); +| + error_vprepend(errp, ...); +) + ... when any +| + Error *local_err = NULL; + ... +( + error_propagate_prepend(errp, local_err, ...); +| + error_propagate(errp, local_err); +) + ... +) + } + + +// Match functions with propagation of local error to errp. +// We want to refer these functions in several following rules, but I +// don't know a proper way to inherit a function, not just its name +// (to not match another functions with same name in following rules). +// Not-proper way is as follows: rename errp parameter in functions +// header and match it in following rules. Rename it back after all +// transformations. +// +// The simplest case of propagation scheme is single definition of +// local_err with at most one error_propagate_prepend or +// error_propagate on each control-flow. Still, we want to match more +// complex schemes too. We'll warn them with help of further rules. +@rule1 disable optional_qualifier exists@ +identifier fn, local_err; +symbol errp; +@@ + + fn(..., Error ** +- errp ++ ____ + , ...) + { + ... + Error *local_err = NULL; + ... +( + error_propagate_prepend(errp, local_err, ...); +| + error_propagate(errp, local_err); +) + ... + } + + +// Warn several Error * definitions. +@check1 disable optional_qualifier exists@ +identifier fn = rule1.fn, local_err, local_err2; +@@ + + fn(..., Error ** ____, ...) + { + ... + Error *local_err = NULL; + ... when any + Error *local_err2 = NULL; + ... when any + } + +@ script:python @ +fn << check1.fn; +@@ + +print('Warning: function {} has several definitions of ' + 'Error * local variable'.format(fn)) + +// Warn several propagations in control flow. +@check2 disable optional_qualifier exists@ +identifier fn = rule1.fn; +symbol errp; +position p1, p2; +@@ + + fn(..., Error ** ____, ...) + { + ... +( + error_propagate_prepend(errp, ...);@p1 +| + error_propagate(errp, ...);@p1 +) + ... +( + error_propagate_prepend(errp, ...);@p2 +| + error_propagate(errp, ...);@p2 +) + ... when any + } + +@ script:python @ +fn << check2.fn; +p1 << check2.p1; +p2 << check2.p2; +@@ + +print('Warning: function {} propagates to errp several times in ' + 'one control flow: at {}:{} and then at {}:{}'.format( + fn, p1[0].file, p1[0].line, p2[0].file, p2[0].line)) + +// Convert special case with goto separately. +// I tried merging this into the following rule the obvious way, but +// it made Coccinelle hang on block.c +// +// Note interesting thing: if we don't do it here, and try to fixup +// "out: }" things later after all transformations (the rule will be +// the same, just without error_propagate() call), coccinelle fails to +// match this "out: }". +@ disable optional_qualifier@ +identifier rule1.fn, rule1.local_err, out; +symbol errp; +@@ + + fn(..., Error ** ____, ...) + { + <... +- goto out; ++ return; + ...> +- out: +- error_propagate(errp, local_err); + } + +// Convert most of local_err related stuff. +// +// Note, that we update everything related to matched by rule1 +// function name and local_err name. We may match something not +// related to the pattern matched by rule1. For example, local_err may +// be defined with the same name in different blocks inside one +// function, and in one block follow the propagation pattern and in +// other block doesn't. Or we may have several functions with the same +// name (for different configurations). +// +// Note also that errp-cleaning functions +// error_free_errp +// error_report_errp +// error_reportf_errp +// warn_report_errp +// warn_reportf_errp +// are not yet implemented. They must call corresponding Error* - +// freeing function and then set *errp to NULL, to avoid further +// propagation to original errp (consider ERRP_AUTO_PROPAGATE in use). +// For example, error_free_errp may look like this: +// +// void error_free_errp(Error **errp) +// { +// error_free(*errp); +// *errp = NULL; +// } +@ disable optional_qualifier exists@ +identifier rule1.fn, rule1.local_err; +expression list args; +symbol errp; +@@ + + fn(..., Error ** ____, ...) + { + <... +( +- Error *local_err = NULL; +| + +// Convert error clearing functions +( +- error_free(local_err); ++ error_free_errp(errp); +| +- error_report_err(local_err); ++ error_report_errp(errp); +| +- error_reportf_err(local_err, args); ++ error_reportf_errp(errp, args); +| +- warn_report_err(local_err); ++ warn_report_errp(errp); +| +- warn_reportf_err(local_err, args); ++ warn_reportf_errp(errp, args); +) +?- local_err = NULL; + +| +- error_propagate_prepend(errp, local_err, args); ++ error_prepend(errp, args); +| +- error_propagate(errp, local_err); +| +- &local_err ++ errp +) + ...> + } + +// Convert remaining local_err usage. For example, different kinds of +// error checking in if conditionals. We can't merge this into +// previous hunk, as this conflicts with other substitutions in it (at +// least with "- local_err = NULL"). +@ disable optional_qualifier@ +identifier rule1.fn, rule1.local_err; +symbol errp; +@@ + + fn(..., Error ** ____, ...) + { + <... +- local_err ++ *errp + ...> + } + +// Always use the same pattern for checking error +@ disable optional_qualifier@ +identifier rule1.fn; +symbol errp; +@@ + + fn(..., Error ** ____, ...) + { + <... +- *errp != NULL ++ *errp + ...> + } + +// Revert temporary ___ identifier. +@ disable optional_qualifier@ +identifier rule1.fn; +@@ + + fn(..., Error ** +- ____ ++ errp + , ...) + { + ... + } diff --git a/include/qapi/error.h b/include/qapi/error.h index 30140d9bfe..56c133520d 100644 --- a/include/qapi/error.h +++ b/include/qapi/error.h @@ -214,6 +214,9 @@ * } * ... * } + * + * For mass-conversion use script + * scripts/coccinelle/auto-propagated-errp.cocci */ #ifndef ERROR_H diff --git a/MAINTAINERS b/MAINTAINERS index 857f969aa1..047f1b9714 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1998,6 +1998,7 @@ F: include/qemu/error-report.h F: qapi/error.json F: util/error.c F: util/qemu-error.c +F: scripts/coccinelle/*err*.cocci GDB stub M: Alex Bennée -- 2.21.0