From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42085) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1baG3z-0001Yd-E3 for qemu-devel@nongnu.org; Thu, 18 Aug 2016 01:40:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1baG3x-0002Ip-Ia for qemu-devel@nongnu.org; Thu, 18 Aug 2016 01:40:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49610) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1baG3x-0002Ij-Cn for qemu-devel@nongnu.org; Thu, 18 Aug 2016 01:40:21 -0400 From: Jason Wang Date: Thu, 18 Aug 2016 13:40:06 +0800 Message-Id: <1471498806-29394-3-git-send-email-jasowang@redhat.com> In-Reply-To: <1471498806-29394-1-git-send-email-jasowang@redhat.com> References: <1471498806-29394-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PULL 2/2] net/net: properly handle multiple packets in net_fill_rstate() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: Zhang Chen , Li Zhijian , Jason Wang From: Zhang Chen When network is busy, we will receive multiple packets at one time. In that situation, we should keep trying to do the receiving instead of finalizing only the first packet. Signed-off-by: Zhang Chen Signed-off-by: Li Zhijian Signed-off-by: Jason Wang --- net/net.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/net.c b/net/net.c index c124b11..d51cb29 100644 --- a/net/net.c +++ b/net/net.c @@ -1602,9 +1602,8 @@ void net_socket_rs_init(SocketReadState *rs, /* * Returns - * 0: SocketReadState is not ready - * 1: SocketReadState is ready - * otherwise error occurs + * 0: success + * -1: error occurs */ int net_fill_rstate(SocketReadState *rs, const uint8_t *buf, int size) { @@ -1652,10 +1651,11 @@ int net_fill_rstate(SocketReadState *rs, const uint8_t *buf, int size) if (rs->finalize) { rs->finalize(rs); } - return 1; } break; } } + + assert(size == 0); return 0; } -- 2.7.4