From nobody Thu Nov 6 08:35:19 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 1497525321045306.80118906795053; Thu, 15 Jun 2017 04:15:21 -0700 (PDT) Received: from localhost ([::1]:53231 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLSkB-0004H8-QF for importer@patchew.org; Thu, 15 Jun 2017 07:15:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLSPG-0008Ta-K8 for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dLSPF-0007dv-RI for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:42 -0400 Received: from mail-wr0-x230.google.com ([2a00:1450:400c:c0c::230]:34258) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dLSPF-0007da-LX for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:41 -0400 Received: by mail-wr0-x230.google.com with SMTP id 77so16397913wrb.1 for ; Thu, 15 Jun 2017 03:53:41 -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.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jun 2017 03:53:39 -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=DRP25rNjYr/vqSe2ODnP62iG4GiLKrCZnJe5jAaleCc=; b=ajGC0732W0hh85ODSJuEDwFjhrenfWAQO5Lnr3lJWTc5f30A36st8RTNB3BFobc8KU Krad5EUlB+LRzbqqlHoOwRLDSjdw2uFtzbbw9PFZ+6R3ukN/VZZtsjlxpoJGrzSlW1md WcaEyw6gdmzSQuIpeljoEpBhTgJbmTXoi5NoqXaGSU7MJERqgH5yH59dLqA2PHSewvmb lpQPuFarTPkYJve40+1fP3jDk5gRhjbmve+BwB2CtW1WBdXBd8DfA1HvaJ6nyQJ6XIn1 35TNmVMAXZdhlkavtlQy81MgmbDLE9cnSpSlsK6Y9BWuCgtTLCSvPvly+YtyAhjNtMDY 4GOg== 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=DRP25rNjYr/vqSe2ODnP62iG4GiLKrCZnJe5jAaleCc=; b=nNepDXFgbI6IVzhcd8raBuM7m3rD8JhrguCtCX2GHby0rbPDh3I+C1lW29lnsX6yPg KsdJdHV3W0dwZrIWR8NL9kQP+No78XJHyCPqUpE1lWVunLrGO3WO3ltcyjjsB+QShqg/ PDe3ntQcMnQlmjUm1nf6wXwcPFAsDiR/2X5bBqq3y1eVGtVCWHKDC9CEL20eW6XGkg5B 3VeznEanj6aUxX9rSV9EDd7tp5QqxOm90s0ohd376+8Hq4r0TO2RjaykOKiInTnRHh+/ VU7aFSlPBJ8zlL9kXdh8COeQMKyXC1F/yaxeGMBtcOqzRalr35/lD9sGBXnQEaHDSmlD FUgQ== X-Gm-Message-State: AKS2vOzMIdmxf45hHfJE+qHCHpDOsfuXoMrLXsYXNwm3BISlcEnu/FBM M5o7B/V2m6Dvi9lRHdg= X-Received: by 10.223.175.200 with SMTP id y8mr394203wrd.163.1497524020336; Thu, 15 Jun 2017 03:53:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 15 Jun 2017 12:52:47 +0200 Message-Id: <1497523981-38449-28-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::230 Subject: [Qemu-devel] [PULL 27/41] nbd/server: get rid of ssize_t 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 Now nbd_read and friends return int, so get rid of ssize_t. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake Message-Id: <20170602150150.258222-5-vsementsov@virtuozzo.com> Signed-off-by: Paolo Bonzini --- nbd/server.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/nbd/server.c b/nbd/server.c index 7f44ef0..895cd7f 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -625,11 +625,11 @@ fail: return rc; } =20 -static ssize_t nbd_receive_request(QIOChannel *ioc, NBDRequest *request) +static int nbd_receive_request(QIOChannel *ioc, NBDRequest *request) { uint8_t buf[NBD_REQUEST_SIZE]; uint32_t magic; - ssize_t ret; + int ret; =20 ret =3D nbd_read(ioc, buf, sizeof(buf), NULL); if (ret < 0) { @@ -663,7 +663,7 @@ static ssize_t nbd_receive_request(QIOChannel *ioc, NBD= Request *request) return 0; } =20 -static ssize_t nbd_send_reply(QIOChannel *ioc, NBDReply *reply) +static int nbd_send_reply(QIOChannel *ioc, NBDReply *reply) { uint8_t buf[NBD_REPLY_SIZE]; =20 @@ -969,11 +969,10 @@ void nbd_export_close_all(void) } } =20 -static ssize_t nbd_co_send_reply(NBDRequestData *req, NBDReply *reply, - int len) +static int nbd_co_send_reply(NBDRequestData *req, NBDReply *reply, int len) { NBDClient *client =3D req->client; - ssize_t rc, ret; + int rc, ret; =20 g_assert(qemu_in_coroutine()); qemu_co_mutex_lock(&client->send_lock); @@ -1003,11 +1002,10 @@ static ssize_t nbd_co_send_reply(NBDRequestData *re= q, NBDReply *reply, * and any other negative value to report an error to the client * (although the caller may still need to disconnect after reporting * the error). */ -static ssize_t nbd_co_receive_request(NBDRequestData *req, - NBDRequest *request) +static int nbd_co_receive_request(NBDRequestData *req, NBDRequest *request) { NBDClient *client =3D req->client; - ssize_t rc; + int rc; =20 g_assert(qemu_in_coroutine()); assert(client->recv_coroutine =3D=3D qemu_coroutine_self()); @@ -1105,7 +1103,7 @@ static coroutine_fn void nbd_trip(void *opaque) NBDRequestData *req; NBDRequest request =3D { 0 }; /* GCC thinks it can be used uninitia= lized */ NBDReply reply; - ssize_t ret; + int ret; int flags; =20 TRACE("Reading request."); --=20 1.8.3.1