From patchwork Thu Aug 18 03:23:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 660315 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sFBLl1ft6z9t16 for ; Thu, 18 Aug 2016 13:25:34 +1000 (AEST) Received: from localhost ([::1]:50504 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1baDxT-0005G0-CJ for incoming@patchwork.ozlabs.org; Wed, 17 Aug 2016 23:25:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42991) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1baDwo-0004tl-QB for qemu-devel@nongnu.org; Wed, 17 Aug 2016 23:24:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1baDwk-0008I4-KC for qemu-devel@nongnu.org; Wed, 17 Aug 2016 23:24:49 -0400 Received: from [59.151.112.132] (port=32124 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1baDwk-0008I0-8C for qemu-devel@nongnu.org; Wed, 17 Aug 2016 23:24:46 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="10029588" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 18 Aug 2016 11:24:44 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 81F6842EB213; Thu, 18 Aug 2016 11:24:43 +0800 (CST) Received: from localhost.localdomain (10.167.226.56) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.279.2; Thu, 18 Aug 2016 11:24:43 +0800 From: Zhang Chen To: qemu devel , Jason Wang Date: Thu, 18 Aug 2016 11:23:25 +0800 Message-ID: <1471490605-2154-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: 81F6842EB213.AA57C X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: zhangchen.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH V2] net/net: Bugfix for net_fill_rstate() 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: Li Zhijian , Zhang Chen , zhanghailiang Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" When network is busy, we will receive multiple packets at one time. In that situation, this bug will lost all packets except the first one. Signed-off-by: Zhang Chen Signed-off-by: Li Zhijian --- net/net.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/net.c b/net/net.c index a8e2e6b..0b11f10 100644 --- a/net/net.c +++ b/net/net.c @@ -1586,9 +1586,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) { @@ -1636,10 +1635,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; }