From nobody Thu Apr 25 15:09:27 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; dmarc=pass(p=quarantine dis=none) header.from=cloudlinux.com ARC-Seal: i=1; a=rsa-sha256; t=1659620504; cv=none; d=zohomail.com; s=zohoarc; b=AMdrCI3ws7RnoPMk2TNuzS5vsZ/dppuGp4+GaH8vylHmXOKlSZ7ZUYXPCxTp0CksJate90OCjicxv/jWrH3c9ZEradiwybWlTjdxiqKleglQnFySlhyVJI9Otw1ODjmSBxh2CLWKK+cyYSBoUQAJ07AgH5V/qWMcQjtEqJ86it0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659620504; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=EB2gY2OKNZotM9bDmROhMc+jvwEmK3M2FM1i0qFZJjA=; b=chR1zWihFY7DqqIYnJBe3AdQSWCwS23jTnvd8/XINkSydwVk0JyIn8nqXCXOCT3hTUMqe1nvuoJbBBBevZjApsukYjLOOHbCXYa6dvCgk+0c7J7DODgVBXRtF4qHmQvJI+A3haEGegV/jcaH0Gse8qSrNRChSS/NDt01I2YX4yw= ARC-Authentication-Results: i=1; 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; 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 1659620504699394.7988984432616; Thu, 4 Aug 2022 06:41:44 -0700 (PDT) Received: from localhost ([::1]:42832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJb6c-0002Rn-FK for importer@patchew.org; Thu, 04 Aug 2022 09:41:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJVEe-0004wd-Gt for qemu-devel@nongnu.org; Thu, 04 Aug 2022 03:25:37 -0400 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]:42534) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oJVEb-0002dv-6N for qemu-devel@nongnu.org; Thu, 04 Aug 2022 03:25:35 -0400 Received: by mail-ed1-x531.google.com with SMTP id m8so24147981edd.9 for ; Thu, 04 Aug 2022 00:25:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudlinux.com; s=google; h=mime-version:from:date:message-id:subject:to:cc; bh=EB2gY2OKNZotM9bDmROhMc+jvwEmK3M2FM1i0qFZJjA=; b=h0wQtkwCuYRSIGJrEAfFV+/sQGu94EnxkgIvg3veYkON5hl27qhgvgUC/Kxh/OIpKT HSc+58MDShr2rHoAzZfkztjQ41ph4GWry78NK+h46PxOP7HIF/PhqtNTx/L4oi/MKxRC VTIx9Z4mJxRzSgFRY6pXA9lgJTAtnK21sm2Wq0eS50F7A/Lt4gUEDRv4RqBTQj+btnPV iTd5rVwYU4i/3w/4/B3chQ47FNidVAPWQE0i1A/t4XqhMplOd6Z2mnd9tElgSfVYwowx kORLBM7ysFVgeEbxKwzug/fytZPuHBGxkDGv9em+Q7Dga9xfKbycTewnF4mzSlfJqWKO qtNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=EB2gY2OKNZotM9bDmROhMc+jvwEmK3M2FM1i0qFZJjA=; b=unv2hWlMSaplPkEchEqgmQdlQL0uqBuMxzABHOt6Et2LlqgQ7kMWlcBO3qixUFmPni HLoY7u27F5O+DFoCXiDC+ZyR5ajW8glpiO/dbbsjDuity2nTj8Bt5mfyUyPNICmGLmO7 H+iD0pqNPWz/TCb1H06uK+MEG4dCe8e9Rku7NEGqvHwNOFyAjctlCWvxt/ZrqifMQi4g v8e6gkpjPRM+HWN+zSwKiwDoyM3nX44gcBO2jJLV8Y7zO/ihvSelGHiwGcQQ8hIg4WSh WDy6yRA1V3z4fuWx9X68pJVK+0PGi4JqjpNLmtKPEUdF0TJNyoxfkecoxwnV3VhPFjdg pa9Q== X-Gm-Message-State: ACgBeo2BdtAhDxx95ydwVLj7h/bC0NFwnZ/80hc0n3ONtk+Kge2tP9Zd xGbqszXV8MUGR724IpehDe/+McbGK2RBDqo8CBb5THc8YsUFwJESovM= X-Google-Smtp-Source: AA6agR5XraAxPEQ7ueLqj1L8wrlyLlg+i/g/D7ogmKX2P4HAjXFDg11In08EetsJdy25BY8uqa2wr5T1NfzzG9oiNEY= X-Received: by 2002:a05:6402:42cb:b0:43d:bf29:cf89 with SMTP id i11-20020a05640242cb00b0043dbf29cf89mr663986edc.400.1659597928856; Thu, 04 Aug 2022 00:25:28 -0700 (PDT) MIME-Version: 1.0 From: Nikita Ivanov Date: Thu, 4 Aug 2022 10:25:17 +0300 Message-ID: Subject: [PATCH] error handling: Use TFR() macro where applicable To: qemu-devel@nongnu.org Cc: Nikita Ivanov , Greg Kurz , Christian Schoenebeck , Jason Wang , Michael Roth , Konstantin Kostiuk , Paolo Bonzini Content-Type: multipart/alternative; boundary="00000000000005141705e5654188" 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=2a00:1450:4864:20::531; envelope-from=nivanov@cloudlinux.com; helo=mail-ed1-x531.google.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, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Thu, 04 Aug 2022 09:33:20 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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 @cloudlinux.com) X-ZM-MESSAGEID: 1659620506044100001 Content-Transfer-Encoding: quoted-printable --00000000000005141705e5654188 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 RnJvbSAwY2ViMDRhZGExZWQ1YTg2MzkxNGY0NDQ5NDY5ZDc1NzJkMzQ0M2VkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOaWtpdGEgSXZhbm92IDxuaXZhbm92QGNsb3VkbGludXguY29t PgpEYXRlOiBXZWQsIDMgQXVnIDIwMjIgMTI6NTQ6MDAgKzAzMDAKU3ViamVjdDogW1BBVENIXSBl cnJvciBoYW5kbGluZzogVXNlIFRGUigpIG1hY3JvIHdoZXJlIGFwcGxpY2FibGUKClRoZXJlIGlz IGEgZGVmaW5lZCBURlIoKSBtYWNybyBpbiBxZW11L29zZGVwLmggd2hpY2gKaGFuZGxlcyB0aGUg c2FtZSB3aGlsZSBsb29wLgpSZXNvbHZlczogaHR0cHM6Ly9naXRsYWIuY29tL3FlbXUtcHJvamVj dC9xZW11Ly0vaXNzdWVzLzQxNQoKU2lnbmVkLW9mZi1ieTogTmlraXRhIEl2YW5vdiA8bml2YW5v dkBjbG91ZGxpbnV4LmNvbT4KLS0tCiBody85cGZzLzlwLWxvY2FsLmMgICB8ICA4ICsrLS0tLS0t CiBuZXQvbDJ0cHYzLmMgICAgICAgICB8IDE1ICsrKy0tLS0tLS0tLS0tLQogbmV0L3RhcC5jICAg ICAgICAgICAgfCAgOCArKy0tLS0tLQogcWdhL2NvbW1hbmRzLXBvc2l4LmMgfCAgNCArLS0tCiB1 dGlsL21haW4tbG9vcC5jICAgICB8ICA0ICstLS0KIHV0aWwvb3NkZXAuYyAgICAgICAgIHwgIDQg Ky0tLQogNiBmaWxlcyBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCAzMyBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9ody85cGZzLzlwLWxvY2FsLmMgYi9ody85cGZzLzlwLWxvY2FsLmMKaW5k ZXggZDQyY2U2ZDhiOC4uYzkwYWI5NDdiYSAxMDA2NDQKLS0tIGEvaHcvOXBmcy85cC1sb2NhbC5j CisrKyBiL2h3LzlwZnMvOXAtbG9jYWwuYwpAQCAtNDcwLDkgKzQ3MCw3IEBAIHN0YXRpYyBzc2l6 ZV90IGxvY2FsX3JlYWRsaW5rKEZzQ29udGV4dCAqZnNfY3R4LApWOWZzUGF0aCAqZnNfcGF0aCwK ICAgICAgICAgaWYgKGZkID0zRD0zRCAtMSkgewogICAgICAgICAgICAgcmV0dXJuIC0xOwogICAg ICAgICB9Ci0gICAgICAgIGRvIHsKLSAgICAgICAgICAgIHRzaXplID0zRCByZWFkKGZkLCAodm9p ZCAqKWJ1ZiwgYnVmc3opOwotICAgICAgICB9IHdoaWxlICh0c2l6ZSA9M0Q9M0QgLTEgJiYgZXJy bm8gPTNEPTNEIEVJTlRSKTsKKyAgICAgICAgVEZSKHRzaXplID0zRCByZWFkKGZkLCAodm9pZCAq KWJ1ZiwgYnVmc3opKTsKICAgICAgICAgY2xvc2VfcHJlc2VydmVfZXJybm8oZmQpOwogICAgIH0g ZWxzZSBpZiAoKGZzX2N0eC0+ZXhwb3J0X2ZsYWdzICYgVjlGU19TTV9QQVNTVEhST1VHSCkgfHwK ICAgICAgICAgICAgICAgIChmc19jdHgtPmV4cG9ydF9mbGFncyAmIFY5RlNfU01fTk9ORSkpIHsK QEAgLTkwOCw5ICs5MDYsNyBAQCBzdGF0aWMgaW50IGxvY2FsX3N5bWxpbmsoRnNDb250ZXh0ICpm c19jdHgsIGNvbnN0IGNoYXIKKm9sZHBhdGgsCiAgICAgICAgIH0KICAgICAgICAgLyogV3JpdGUg dGhlIG9sZHBhdGggKHRhcmdldCkgdG8gdGhlIGZpbGUuICovCiAgICAgICAgIG9sZHBhdGhfc2l6 ZSA9M0Qgc3RybGVuKG9sZHBhdGgpOwotICAgICAgICBkbyB7Ci0gICAgICAgICAgICB3cml0ZV9z aXplID0zRCB3cml0ZShmZCwgKHZvaWQgKilvbGRwYXRoLCBvbGRwYXRoX3NpemUpOwotICAgICAg ICB9IHdoaWxlICh3cml0ZV9zaXplID0zRD0zRCAtMSAmJiBlcnJubyA9M0Q9M0QgRUlOVFIpOwor ICAgICAgICBURlIod3JpdGVfc2l6ZSA9M0Qgd3JpdGUoZmQsICh2b2lkICopb2xkcGF0aCwgb2xk cGF0aF9zaXplKSk7CiAgICAgICAgIGNsb3NlX3ByZXNlcnZlX2Vycm5vKGZkKTsKCiAgICAgICAg IGlmICh3cml0ZV9zaXplICE9M0Qgb2xkcGF0aF9zaXplKSB7CmRpZmYgLS1naXQgYS9uZXQvbDJ0 cHYzLmMgYi9uZXQvbDJ0cHYzLmMKaW5kZXggYWYzNzNlNWMzMC4uYWRmZGJkYjg0YyAxMDA2NDQK LS0tIGEvbmV0L2wydHB2My5jCisrKyBiL25ldC9sMnRwdjMuYwpAQCAtMjQwLDkgKzI0MCw3IEBA IHN0YXRpYyBzc2l6ZV90Cm5ldF9sMnRwdjNfcmVjZWl2ZV9kZ3JhbV9pb3YoTmV0Q2xpZW50U3Rh dGUgKm5jLAogICAgIG1lc3NhZ2UubXNnX2NvbnRyb2wgPTNEIE5VTEw7CiAgICAgbWVzc2FnZS5t c2dfY29udHJvbGxlbiA9M0QgMDsKICAgICBtZXNzYWdlLm1zZ19mbGFncyA9M0QgMDsKLSAgICBk byB7Ci0gICAgICAgIHJldCA9M0Qgc2VuZG1zZyhzLT5mZCwgJm1lc3NhZ2UsIDApOwotICAgIH0g d2hpbGUgKChyZXQgPTNEPTNEIC0xKSAmJiAoZXJybm8gPTNEPTNEIEVJTlRSKSk7CisgICAgVEZS KHJldCA9M0Qgc2VuZG1zZyhzLT5mZCwgJm1lc3NhZ2UsIDApKTsKICAgICBpZiAocmV0ID4gMCkg ewogICAgICAgICByZXQgLT0zRCBzLT5vZmZzZXQ7CiAgICAgfSBlbHNlIGlmIChyZXQgPTNEPTNE IDApIHsKQEAgLTI4NSw5ICsyODMsNyBAQCBzdGF0aWMgc3NpemVfdCBuZXRfbDJ0cHYzX3JlY2Vp dmVfZGdyYW0oTmV0Q2xpZW50U3RhdGUKKm5jLAogICAgIG1lc3NhZ2UubXNnX2NvbnRyb2wgPTNE IE5VTEw7CiAgICAgbWVzc2FnZS5tc2dfY29udHJvbGxlbiA9M0QgMDsKICAgICBtZXNzYWdlLm1z Z19mbGFncyA9M0QgMDsKLSAgICBkbyB7Ci0gICAgICAgIHJldCA9M0Qgc2VuZG1zZyhzLT5mZCwg Jm1lc3NhZ2UsIDApOwotICAgIH0gd2hpbGUgKChyZXQgPTNEPTNEIC0xKSAmJiAoZXJybm8gPTNE PTNEIEVJTlRSKSk7CisgICAgVEZSKHJldCA9M0Qgc2VuZG1zZyhzLT5mZCwgJm1lc3NhZ2UsIDAp KTsKICAgICBpZiAocmV0ID4gMCkgewogICAgICAgICByZXQgLT0zRCBzLT5vZmZzZXQ7CiAgICAg fSBlbHNlIGlmIChyZXQgPTNEPTNEIDApIHsKQEAgLTQzNCwxMiArNDMwLDcgQEAgc3RhdGljIHZv aWQgbmV0X2wydHB2M19zZW5kKHZvaWQgKm9wYXF1ZSkKCiAgICAgbXNndmVjID0zRCBzLT5tc2d2 ZWMgKyBzLT5xdWV1ZV9oZWFkOwogICAgIGlmICh0YXJnZXRfY291bnQgPiAwKSB7Ci0gICAgICAg IGRvIHsKLSAgICAgICAgICAgIGNvdW50ID0zRCByZWN2bW1zZygKLSAgICAgICAgICAgICAgICBz LT5mZCwKLSAgICAgICAgICAgICAgICBtc2d2ZWMsCi0gICAgICAgICAgICAgICAgdGFyZ2V0X2Nv dW50LCBNU0dfRE9OVFdBSVQsIE5VTEwpOwotICAgICAgICB9IHdoaWxlICgoY291bnQgPTNEPTNE IC0xKSAmJiAoZXJybm8gPTNEPTNEIEVJTlRSKSk7CisgICAgICAgIFRGUihjb3VudCA9M0QgcmVj dm1tc2cocy0+ZmQsIG1zZ3ZlYywgdGFyZ2V0X2NvdW50LCBNU0dfRE9OVFdBSVQsCk5VTEwpKTsK ICAgICAgICAgaWYgKGNvdW50IDwgMCkgewogICAgICAgICAgICAgLyogUmVjdiBlcnJvciAtIHdl IHN0aWxsIG5lZWQgdG8gZmx1c2ggcGFja2V0cyBoZXJlLAogICAgICAgICAgICAgICogKHJlKXNl dCBxdWV1ZSBoZWFkIHRvIGN1cnJlbnQgcG9zaXRpb24KZGlmZiAtLWdpdCBhL25ldC90YXAuYyBi L25ldC90YXAuYwppbmRleCBiM2RkZmQ0YTc0Li5iMDQ3ZWNhOGI1IDEwMDY0NAotLS0gYS9uZXQv dGFwLmMKKysrIGIvbmV0L3RhcC5jCkBAIC0xMDIsOSArMTAyLDcgQEAgc3RhdGljIHNzaXplX3Qg dGFwX3dyaXRlX3BhY2tldChUQVBTdGF0ZSAqcywgY29uc3QKc3RydWN0IGlvdmVjICppb3YsIGlu dCBpb3ZjbnQKIHsKICAgICBzc2l6ZV90IGxlbjsKCi0gICAgZG8gewotICAgICAgICBsZW4gPTNE IHdyaXRldihzLT5mZCwgaW92LCBpb3ZjbnQpOwotICAgIH0gd2hpbGUgKGxlbiA9M0Q9M0QgLTEg JiYgZXJybm8gPTNEPTNEIEVJTlRSKTsKKyAgICBURlIobGVuID0zRCB3cml0ZXYocy0+ZmQsIGlv diwgaW92Y250KSk7CgogICAgIGlmIChsZW4gPTNEPTNEIC0xICYmIGVycm5vID0zRD0zRCBFQUdB SU4pIHsKICAgICAgICAgdGFwX3dyaXRlX3BvbGwocywgdHJ1ZSk7CkBAIC01NzcsOSArNTc1LDcg QEAgc3RhdGljIGludCBuZXRfYnJpZGdlX3J1bl9oZWxwZXIoY29uc3QgY2hhciAqaGVscGVyLApj b25zdCBjaGFyICpicmlkZ2UsCgogICAgICAgICBjbG9zZShzdlsxXSk7CgotICAgICAgICBkbyB7 Ci0gICAgICAgICAgICBmZCA9M0QgcmVjdl9mZChzdlswXSk7Ci0gICAgICAgIH0gd2hpbGUgKGZk ID0zRD0zRCAtMSAmJiBlcnJubyA9M0Q9M0QgRUlOVFIpOworICAgICAgICBURlIoZmQgPTNEIHJl Y3ZfZmQoc3ZbMF0pKTsKICAgICAgICAgc2F2ZWRfZXJybm8gPTNEIGVycm5vOwoKICAgICAgICAg Y2xvc2Uoc3ZbMF0pOwpkaWZmIC0tZ2l0IGEvcWdhL2NvbW1hbmRzLXBvc2l4LmMgYi9xZ2EvY29t bWFuZHMtcG9zaXguYwppbmRleCA5NTRlZmVkMDFiLi45MGY4M2FhOWI2IDEwMDY0NAotLS0gYS9x Z2EvY29tbWFuZHMtcG9zaXguYworKysgYi9xZ2EvY29tbWFuZHMtcG9zaXguYwpAQCAtNjgsOSAr NjgsNyBAQCBzdGF0aWMgdm9pZCBnYV93YWl0X2NoaWxkKHBpZF90IHBpZCwgaW50ICpzdGF0dXMs IEVycm9yCioqZXJycCkKCiAgICAgKnN0YXR1cyA9M0QgMDsKCi0gICAgZG8gewotICAgICAgICBy cGlkID0zRCB3YWl0cGlkKHBpZCwgc3RhdHVzLCAwKTsKLSAgICB9IHdoaWxlIChycGlkID0zRD0z RCAtMSAmJiBlcnJubyA9M0Q9M0QgRUlOVFIpOworICAgIFRGUihycGlkID0zRCB3YWl0cGlkKHBp ZCwgc3RhdHVzLCAwKSk7CgogICAgIGlmIChycGlkID0zRD0zRCAtMSkgewogICAgICAgICBlcnJv cl9zZXRnX2Vycm5vKGVycnAsIGVycm5vLCAiZmFpbGVkIHRvIHdhaXQgZm9yIGNoaWxkIChwaWQ6 ICVkKSIsCmRpZmYgLS1naXQgYS91dGlsL21haW4tbG9vcC5jIGIvdXRpbC9tYWluLWxvb3AuYwpp bmRleCBmMDBhMjU0NTFiLi41OGUxNGRiMmQ0IDEwMDY0NAotLS0gYS91dGlsL21haW4tbG9vcC5j CisrKyBiL3V0aWwvbWFpbi1sb29wLmMKQEAgLTY0LDkgKzY0LDcgQEAgc3RhdGljIHZvaWQgc2ln ZmRfaGFuZGxlcih2b2lkICpvcGFxdWUpCiAgICAgc3NpemVfdCBsZW47CgogICAgIHdoaWxlICgx KSB7Ci0gICAgICAgIGRvIHsKLSAgICAgICAgICAgIGxlbiA9M0QgcmVhZChmZCwgJmluZm8sIHNp emVvZihpbmZvKSk7Ci0gICAgICAgIH0gd2hpbGUgKGxlbiA9M0Q9M0QgLTEgJiYgZXJybm8gPTNE PTNEIEVJTlRSKTsKKyAgICAgICAgVEZSKGxlbiA9M0QgcmVhZChmZCwgJmluZm8sIHNpemVvZihp bmZvKSkpOwoKICAgICAgICAgaWYgKGxlbiA9M0Q9M0QgLTEgJiYgZXJybm8gPTNEPTNEIEVBR0FJ TikgewogICAgICAgICAgICAgYnJlYWs7CmRpZmYgLS1naXQgYS91dGlsL29zZGVwLmMgYi91dGls L29zZGVwLmMKaW5kZXggNjBmY2JiYWViZS4uZDM1YzQ3M2FjNyAxMDA2NDQKLS0tIGEvdXRpbC9v c2RlcC5jCisrKyBiL3V0aWwvb3NkZXAuYwpAQCAtMjQ0LDkgKzI0NCw3IEBAIHN0YXRpYyBpbnQg cWVtdV9sb2NrX2ZjbnRsKGludCBmZCwgaW50NjRfdCBzdGFydCwKaW50NjRfdCBsZW4sIGludCBm bF90eXBlKQogICAgICAgICAubF90eXBlICAgPTNEIGZsX3R5cGUsCiAgICAgfTsKICAgICBxZW11 X3Byb2JlX2xvY2tfb3BzKCk7Ci0gICAgZG8gewotICAgICAgICByZXQgPTNEIGZjbnRsKGZkLCBm Y250bF9vcF9zZXRsaywgJmZsKTsKLSAgICB9IHdoaWxlIChyZXQgPTNEPTNEIC0xICYmIGVycm5v ID0zRD0zRCBFSU5UUik7CisgICAgVEZSKHJldCA9M0QgZmNudGwoZmQsIGZjbnRsX29wX3NldGxr LCAmZmwpKTsKICAgICByZXR1cm4gcmV0ID0zRD0zRCAtMSA/IC1lcnJubyA6IDA7CiB9CgotLT0y MAoyLjM3LjE= --00000000000005141705e5654188 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
From 0ceb04ada1ed5a863914f4449469d7572d3443ed Mon Sep 17 0= 0:00:00 2001
From: Nikita Ivanov <nivanov@cloudlinux.com>
Date: Wed, 3 Aug 2022 12:54:00 +03= 00
Subject: [PATCH] error handling: Use TFR() macro where applicable
=
There is a defined TFR() macro in qemu/osdep.h which
handles the sam= e while loop.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/415

= Signed-off-by: Nikita Ivanov <= nivanov@cloudlinux.com>
---
=C2=A0hw/9pfs/9p-local.c =C2=A0 | = =C2=A08 ++------
=C2=A0net/l2tpv3.c =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 15 +++= ------------
=C2=A0net/tap.c =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| = =C2=A08 ++------
=C2=A0qga/commands-posix.c | =C2=A04 +---
=C2=A0util= /main-loop.c =C2=A0 =C2=A0 | =C2=A04 +---
=C2=A0util/osdep.c =C2=A0 =C2= =A0 =C2=A0 =C2=A0 | =C2=A04 +---
=C2=A06 files changed, 10 insertions(+)= , 33 deletions(-)

diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local= .c
index d42ce6d8b8..c90ab947ba 100644
--- a/hw/9pfs/9p-local.c
++= + b/hw/9pfs/9p-local.c
@@ -470,9 +470,7 @@ static ssize_t local_readlink= (FsContext *fs_ctx, V9fsPath *fs_path,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0if (fd =3D=3D -1) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0r= eturn -1;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
- =C2=A0 =C2=A0 =C2=A0 = =C2=A0do {
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0tsize =3D read(fd,= (void *)buf, bufsz);
- =C2=A0 =C2=A0 =C2=A0 =C2=A0} while (tsize =3D=3D= -1 && errno =3D=3D EINTR);
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0TFR(tsi= ze =3D read(fd, (void *)buf, bufsz));
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= close_preserve_errno(fd);
=C2=A0 =C2=A0 =C2=A0} else if ((fs_ctx->exp= ort_flags & V9FS_SM_PASSTHROUGH) ||
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 (fs_ctx->export_flags & V9FS_SM_NONE)) {@@ -908,9 +906,7 @@ static int local_symlink(FsContext *fs_ctx, const char= *oldpath,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
=C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0/* Write the oldpath (target) to the file. */
=C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0oldpath_size =3D strlen(oldpath);
- =C2=A0 =C2=A0 = =C2=A0 =C2=A0do {
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0write_size = =3D write(fd, (void *)oldpath, oldpath_size);
- =C2=A0 =C2=A0 =C2=A0 =C2= =A0} while (write_size =3D=3D -1 && errno =3D=3D EINTR);
+ =C2= =A0 =C2=A0 =C2=A0 =C2=A0TFR(write_size =3D write(fd, (void *)oldpath, oldpa= th_size));
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0close_preserve_errno(fd);=C2=A0
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (write_size !=3D oldpath_s= ize) {
diff --git a/net/l2tpv3.c b/net/l2tpv3.c
index af373e5c30..adf= dbdb84c 100644
--- a/net/l2tpv3.c
+++ b/net/l2tpv3.c
@@ -240,9 +24= 0,7 @@ static ssize_t net_l2tpv3_receive_dgram_iov(NetClientState *nc,
= =C2=A0 =C2=A0 =C2=A0message.msg_control =3D NULL;
=C2=A0 =C2=A0 =C2=A0me= ssage.msg_controllen =3D 0;
=C2=A0 =C2=A0 =C2=A0message.msg_flags =3D 0;=
- =C2=A0 =C2=A0do {
- =C2=A0 =C2=A0 =C2=A0 =C2=A0ret =3D sendmsg(s-&= gt;fd, &message, 0);
- =C2=A0 =C2=A0} while ((ret =3D=3D -1) &&a= mp; (errno =3D=3D EINTR));
+ =C2=A0 =C2=A0TFR(ret =3D sendmsg(s->fd, = &message, 0));
=C2=A0 =C2=A0 =C2=A0if (ret > 0) {
=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0ret -=3D s->offset;
=C2=A0 =C2=A0 =C2=A0} els= e if (ret =3D=3D 0) {
@@ -285,9 +283,7 @@ static ssize_t net_l2tpv3_rece= ive_dgram(NetClientState *nc,
=C2=A0 =C2=A0 =C2=A0message.msg_control = =3D NULL;
=C2=A0 =C2=A0 =C2=A0message.msg_controllen =3D 0;
=C2=A0 = =C2=A0 =C2=A0message.msg_flags =3D 0;
- =C2=A0 =C2=A0do {
- =C2=A0 = =C2=A0 =C2=A0 =C2=A0ret =3D sendmsg(s->fd, &message, 0);
- =C2=A0= =C2=A0} while ((ret =3D=3D -1) && (errno =3D=3D EINTR));
+ =C2= =A0 =C2=A0TFR(ret =3D sendmsg(s->fd, &message, 0));
=C2=A0 =C2=A0= =C2=A0if (ret > 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ret -=3D s-&g= t;offset;
=C2=A0 =C2=A0 =C2=A0} else if (ret =3D=3D 0) {
@@ -434,12 += 430,7 @@ static void net_l2tpv3_send(void *opaque)
=C2=A0
=C2=A0 =C2= =A0 =C2=A0msgvec =3D s->msgvec + s->queue_head;
=C2=A0 =C2=A0 =C2= =A0if (target_count > 0) {
- =C2=A0 =C2=A0 =C2=A0 =C2=A0do {
- =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0count =3D recvmmsg(
- =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0s->fd,
- =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0msgvec,
- =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0target_count, MSG_DONTWAIT, NULL);
- = =C2=A0 =C2=A0 =C2=A0 =C2=A0} while ((count =3D=3D -1) && (errno =3D= =3D EINTR));
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0TFR(count =3D recvmmsg(s->f= d, msgvec, target_count, MSG_DONTWAIT, NULL));
=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0if (count < 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0/* Recv error - we still need to flush packets here,
=C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 * (re)set queue head to current positio= n
diff --git a/net/tap.c b/net/tap.c
index b3ddfd4a74..b047eca8b5 100= 644
--- a/net/tap.c
+++ b/net/tap.c
@@ -102,9 +102,7 @@ static ssi= ze_t tap_write_packet(TAPState *s, const struct iovec *iov, int iovcnt
= =C2=A0{
=C2=A0 =C2=A0 =C2=A0ssize_t len;
=C2=A0
- =C2=A0 =C2=A0do = {
- =C2=A0 =C2=A0 =C2=A0 =C2=A0len =3D writev(s->fd, iov, iovcnt);- =C2=A0 =C2=A0} while (len =3D=3D -1 && errno =3D=3D EINTR);
+= =C2=A0 =C2=A0TFR(len =3D writev(s->fd, iov, iovcnt));
=C2=A0
=C2= =A0 =C2=A0 =C2=A0if (len =3D=3D -1 && errno =3D=3D EAGAIN) {
=C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0tap_write_poll(s, true);
@@ -577,9 +575,7= @@ static int net_bridge_run_helper(const char *helper, const char *bridge= ,
=C2=A0
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0close(sv[1]);
=C2=A0- =C2=A0 =C2=A0 =C2=A0 =C2=A0do {
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0fd =3D recv_fd(sv[0]);
- =C2=A0 =C2=A0 =C2=A0 =C2=A0} while (fd = =3D=3D -1 && errno =3D=3D EINTR);
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0T= FR(fd =3D recv_fd(sv[0]));
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0saved_errno= =3D errno;
=C2=A0
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0close(sv[0]);diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 954efed0= 1b..90f83aa9b6 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-p= osix.c
@@ -68,9 +68,7 @@ static void ga_wait_child(pid_t pid, int *statu= s, Error **errp)
=C2=A0
=C2=A0 =C2=A0 =C2=A0*status =3D 0;
=C2=A0<= br>- =C2=A0 =C2=A0do {
- =C2=A0 =C2=A0 =C2=A0 =C2=A0rpid =3D waitpid(pid= , status, 0);
- =C2=A0 =C2=A0} while (rpid =3D=3D -1 && errno = =3D=3D EINTR);
+ =C2=A0 =C2=A0TFR(rpid =3D waitpid(pid, status, 0));
= =C2=A0
=C2=A0 =C2=A0 =C2=A0if (rpid =3D=3D -1) {
=C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0error_setg_errno(errp, errno, "failed to wait for child = (pid: %d)",
diff --git a/util/main-loop.c b/util/main-loop.c
ind= ex f00a25451b..58e14db2d4 100644
--- a/util/main-loop.c
+++ b/util/ma= in-loop.c
@@ -64,9 +64,7 @@ static void sigfd_handler(void *opaque)
= =C2=A0 =C2=A0 =C2=A0ssize_t len;
=C2=A0
=C2=A0 =C2=A0 =C2=A0while (1)= {
- =C2=A0 =C2=A0 =C2=A0 =C2=A0do {
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0len =3D read(fd, &info, sizeof(info));
- =C2=A0 =C2=A0 = =C2=A0 =C2=A0} while (len =3D=3D -1 && errno =3D=3D EINTR);
+ = =C2=A0 =C2=A0 =C2=A0 =C2=A0TFR(len =3D read(fd, &info, sizeof(info)));<= br>=C2=A0
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (len =3D=3D -1 &&= errno =3D=3D EAGAIN) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= break;
diff --git a/util/osdep.c b/util/osdep.c
index 60fcbbaebe..d35= c473ac7 100644
--- a/util/osdep.c
+++ b/util/osdep.c
@@ -244,9 +24= 4,7 @@ static int qemu_lock_fcntl(int fd, int64_t start, int64_t len, int f= l_type)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0.l_type =C2=A0 =3D fl_type,=C2=A0 =C2=A0 =C2=A0};
=C2=A0 =C2=A0 =C2=A0qemu_probe_lock_ops();
- = =C2=A0 =C2=A0do {
- =C2=A0 =C2=A0 =C2=A0 =C2=A0ret =3D fcntl(fd, fcntl_o= p_setlk, &fl);
- =C2=A0 =C2=A0} while (ret =3D=3D -1 && errn= o =3D=3D EINTR);
+ =C2=A0 =C2=A0TFR(ret =3D fcntl(fd, fcntl_op_setlk, &a= mp;fl));
=C2=A0 =C2=A0 =C2=A0return ret =3D=3D -1 ? -errno : 0;
=C2= =A0}
=C2=A0
--
2.37.1
--00000000000005141705e5654188--