From nobody Sun May 5 08:57:52 2024 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.zohomail.com; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1541794510904810.3156466011964; Fri, 9 Nov 2018 12:15:10 -0800 (PST) Received: from localhost ([::1]:35794 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gLDBA-0004ua-Tv for importer@patchew.org; Fri, 09 Nov 2018 15:14:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gLDAH-0004dg-7p for qemu-devel@nongnu.org; Fri, 09 Nov 2018 15:14:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gLDAB-0006Jq-AI for qemu-devel@nongnu.org; Fri, 09 Nov 2018 15:13:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38296) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gLDA7-00061y-2n for qemu-devel@nongnu.org; Fri, 09 Nov 2018 15:13:52 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4C95088E5F for ; Fri, 9 Nov 2018 20:13:48 +0000 (UTC) Received: from localhost (ovpn-112-21.ams2.redhat.com [10.36.112.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A2A461373; Fri, 9 Nov 2018 20:13:41 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Sat, 10 Nov 2018 00:13:25 +0400 Message-Id: <20181109201325.26177-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 09 Nov 2018 20:13:48 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] net: refactor net_socket_send() 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , jasowang@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Simplify net_socket_send(), avoid extra buf/buf1 variable, and backwards goto. Signed-off-by: Marc-Andr=C3=A9 Lureau --- net/socket.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/net/socket.c b/net/socket.c index c92354049b..8a9c30892d 100644 --- a/net/socket.c +++ b/net/socket.c @@ -159,17 +159,12 @@ static void net_socket_send(void *opaque) { NetSocketState *s =3D opaque; int size; - int ret; - uint8_t buf1[NET_BUFSIZE]; - const uint8_t *buf; - - size =3D qemu_recv(s->fd, buf1, sizeof(buf1), 0); - if (size < 0) { - if (errno !=3D EWOULDBLOCK) - goto eoc; - } else if (size =3D=3D 0) { + uint8_t buf[NET_BUFSIZE]; + + size =3D qemu_recv(s->fd, buf, sizeof(buf), 0); + if (size =3D=3D 0 || (size < 0 && errno !=3D EWOULDBLOCK) || + net_fill_rstate(&s->rs, buf, size) =3D=3D -1) { /* end of connection */ - eoc: net_socket_read_poll(s, false); net_socket_write_poll(s, false); if (s->listen_fd !=3D -1) { @@ -181,15 +176,6 @@ static void net_socket_send(void *opaque) net_socket_rs_init(&s->rs, net_socket_rs_finalize, false); s->nc.link_down =3D true; memset(s->nc.info_str, 0, sizeof(s->nc.info_str)); - - return; - } - buf =3D buf1; - - ret =3D net_fill_rstate(&s->rs, buf, size); - - if (ret =3D=3D -1) { - goto eoc; } } =20 --=20 2.19.1.708.g4ede3d42df