From nobody Thu Nov 6 08:37:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1497525157681939.378753754509; Thu, 15 Jun 2017 04:12:37 -0700 (PDT) Received: from localhost ([::1]:53214 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLShX-0001D9-AG for importer@patchew.org; Thu, 15 Jun 2017 07:12:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41191) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLSPP-0000D7-Mk for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dLSPN-0007ic-Pk for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:51 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:35320) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dLSPN-0007i7-Js for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:49 -0400 Received: by mail-wr0-x242.google.com with SMTP id z45so2764721wrb.2 for ; Thu, 15 Jun 2017 03:53:49 -0700 (PDT) Received: from 640k.lan (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id f21sm3258597wra.5.2017.06.15.03.53.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jun 2017 03:53:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=AGpEalCbEme19ON0xB1zzEaR/1exViGRuXK/TS5Bpp4=; b=uZ344BdQ/t+mIthN4/AdCLadZOx/fkMkeuFUGcMngWlzR2tC7gn9Pd9TKCxTtlYHh6 diYROcFrFumKxnRPqd2jTWvRo5qG0PSuWuqxJ8giFsBcfroHNFv7mtqDEzKpn2BH8gvC JtBNKMlofXJWb4S6rSCFvr89zk/36gz+Lz7pXenKao2VE2UpPSTdcK8L+EQwzPBt1F3i lk/69UkJM/xs2n9F0K7G/HLW6CfG4WNRNewwvgjkEVG0pGx6oswkBKNyacn8h5Ms8vXO 4r+t31NjV5/xZ1yzrNqrHP8ASv8+hcG1F8OH6nDPDjTvoMBtmHWfZjZ9CpttsE8njB8/ JgDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=AGpEalCbEme19ON0xB1zzEaR/1exViGRuXK/TS5Bpp4=; b=O5rYWudxNKM4YDHpstgWkDgjQ4tTa8G5l+gXiuG/zOEQ/XLOVTH/97kFvuU+FG/48j /z/5OreHbJ8z1y1LsNiXgJzPvIdB+r0vU8qLRSF6Z8eD5mlX9lXX7p3UZlcCvvvmAduh +CdSchMCeifzWuUfGScOKAOQsjRrMYAMEUPtOW0Gn4k83ZGrO7aJS8BJAFPYTTOpXSDC YjSEArH3uWNVpuByNEO0qKwr3yCSAzhIMzaKxoW3qo8hI3dfWuetr5DKvQz61GfVZa3I M9nKBNvxdFfSfNhNjXkdssYvWRJnzfRMwtKX9HkkgmkNL1YS8K+JxLvOFTtfK3XLK9Q3 CVQA== X-Gm-Message-State: AKS2vOzEt/FmSWC2OQAy11mBlGXRIslL1nxBQlhAZYGrQWFuNE0xwiwh bReUSpoPivY74ghCVpk= X-Received: by 10.223.171.226 with SMTP id s89mr1223510wrc.38.1497524028309; Thu, 15 Jun 2017 03:53:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 15 Jun 2017 12:52:54 +0200 Message-Id: <1497523981-38449-35-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1497523981-38449-1-git-send-email-pbonzini@redhat.com> References: <1497523981-38449-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::242 Subject: [Qemu-devel] [PULL 34/41] nbd/server: rename rc to ret X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy For consistency use 'ret' name for saving return code everywhere in the file. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake Message-Id: <20170602150150.258222-12-vsementsov@virtuozzo.com> Signed-off-by: Paolo Bonzini --- nbd/server.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/nbd/server.c b/nbd/server.c index 3b46038..f19f5fd 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -211,15 +211,15 @@ static int nbd_negotiate_send_rep_list(QIOChannel *io= c, NBDExport *exp) uint32_t len; const char *name =3D exp->name ? exp->name : ""; const char *desc =3D exp->description ? exp->description : ""; - int rc; + int ret; =20 TRACE("Advertising export name '%s' description '%s'", name, desc); name_len =3D strlen(name); desc_len =3D strlen(desc); len =3D name_len + desc_len + sizeof(len); - rc =3D nbd_negotiate_send_rep_len(ioc, NBD_REP_SERVER, NBD_OPT_LIST, l= en); - if (rc < 0) { - return rc; + ret =3D nbd_negotiate_send_rep_len(ioc, NBD_REP_SERVER, NBD_OPT_LIST, = len); + if (ret < 0) { + return ret; } =20 len =3D cpu_to_be32(name_len); @@ -536,7 +536,7 @@ static int nbd_negotiate_options(NBDClient *client) static coroutine_fn int nbd_negotiate(NBDClient *client) { char buf[8 + 8 + 8 + 128]; - int rc; + int ret; const uint16_t myflags =3D (NBD_FLAG_HAS_FLAGS | NBD_FLAG_SEND_TRIM | NBD_FLAG_SEND_FLUSH | NBD_FLAG_SEND_FUA | NBD_FLAG_SEND_WRITE_ZEROES); @@ -593,10 +593,10 @@ static coroutine_fn int nbd_negotiate(NBDClient *clie= nt) LOG("write failed"); return -EINVAL; } - rc =3D nbd_negotiate_options(client); - if (rc !=3D 0) { + ret =3D nbd_negotiate_options(client); + if (ret !=3D 0) { LOG("option negotiation failed"); - return rc; + return ret; } =20 TRACE("advertising size %" PRIu64 " and flags %x", @@ -604,10 +604,10 @@ static coroutine_fn int nbd_negotiate(NBDClient *clie= nt) stq_be_p(buf + 18, client->exp->size); stw_be_p(buf + 26, client->exp->nbdflags | myflags); len =3D client->no_zeroes ? 10 : sizeof(buf) - 18; - rc =3D nbd_write(client->ioc, buf + 18, len, NULL); - if (rc < 0) { + ret =3D nbd_write(client->ioc, buf + 18, len, NULL); + if (ret < 0) { LOG("write failed"); - return rc; + return ret; } } =20 @@ -963,21 +963,21 @@ void nbd_export_close_all(void) static int nbd_co_send_reply(NBDRequestData *req, NBDReply *reply, int len) { NBDClient *client =3D req->client; - int rc; + int ret; =20 g_assert(qemu_in_coroutine()); qemu_co_mutex_lock(&client->send_lock); client->send_coroutine =3D qemu_coroutine_self(); =20 if (!len) { - rc =3D nbd_send_reply(client->ioc, reply); + ret =3D nbd_send_reply(client->ioc, reply); } else { qio_channel_set_cork(client->ioc, true); - rc =3D nbd_send_reply(client->ioc, reply); - if (rc =3D=3D 0) { - rc =3D nbd_write(client->ioc, req->data, len, NULL); - if (rc < 0) { - rc =3D -EIO; + ret =3D nbd_send_reply(client->ioc, reply); + if (ret =3D=3D 0) { + ret =3D nbd_write(client->ioc, req->data, len, NULL); + if (ret < 0) { + ret =3D -EIO; } } qio_channel_set_cork(client->ioc, false); @@ -985,7 +985,7 @@ static int nbd_co_send_reply(NBDRequestData *req, NBDRe= ply *reply, int len) =20 client->send_coroutine =3D NULL; qemu_co_mutex_unlock(&client->send_lock); - return rc; + return ret; } =20 /* nbd_co_receive_request --=20 1.8.3.1