From patchwork Thu Oct 27 08:50:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Wu X-Patchwork-Id: 122091 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E14271007D8 for ; Thu, 27 Oct 2011 19:51:43 +1100 (EST) Received: from localhost ([::1]:49715 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJLgb-0004Ue-EA for incoming@patchwork.ozlabs.org; Thu, 27 Oct 2011 04:51:41 -0400 Received: from eggs.gnu.org ([140.186.70.92]:33673) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJLgL-00040g-KK for qemu-devel@nongnu.org; Thu, 27 Oct 2011 04:51:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RJLgJ-0006Qh-Eg for qemu-devel@nongnu.org; Thu, 27 Oct 2011 04:51:25 -0400 Received: from e28smtp09.in.ibm.com ([122.248.162.9]:51690) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJLgI-0006QF-Sv for qemu-devel@nongnu.org; Thu, 27 Oct 2011 04:51:23 -0400 Received: from /spool/local by e28smtp09.in.ibm.com with XMail ESMTP for from ; Thu, 27 Oct 2011 14:21:19 +0530 Received: from d28relay05.in.ibm.com ([9.184.220.62]) by e28smtp09.in.ibm.com ([192.168.1.139]) with XMail ESMTP; Thu, 27 Oct 2011 14:21:17 +0530 Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p9R8pA6s3174410 for ; Thu, 27 Oct 2011 14:21:10 +0530 Received: from d28av05.in.ibm.com (loopback [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p9R8pAUi016658 for ; Thu, 27 Oct 2011 19:51:10 +1100 Received: from oc4654482034.ibm.com ([9.115.122.78]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p9R8p9BG014847; Thu, 27 Oct 2011 19:51:10 +1100 Received: by oc4654482034.ibm.com (Postfix, from userid 500) id A10814479A; Thu, 27 Oct 2011 16:50:16 +0800 (CST) From: Mark Wu To: wudx05@gmail.com Date: Thu, 27 Oct 2011 16:50:16 +0800 Message-Id: <1319705416-24285-1-git-send-email-wudxw@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 x-cbid: 11102708-2674-0000-0000-000000FD61A4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 122.248.162.9 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] Only flush queue or call sent callback on successful delivery X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Now queue flushing and sent callback could be invoked even on delivery failure. We add a checking of receiver's return value to avoid this case. Signed-off-by: Mark Wu --- net/queue.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/net/queue.c b/net/queue.c index 1ab5247..c9a027c 100644 --- a/net/queue.c +++ b/net/queue.c @@ -190,8 +190,9 @@ ssize_t qemu_net_queue_send(NetQueue *queue, qemu_net_queue_append(queue, sender, flags, data, size, sent_cb); return 0; } - - qemu_net_queue_flush(queue); + if (ret > 0) { + qemu_net_queue_flush(queue); + } return ret; } @@ -214,8 +215,9 @@ ssize_t qemu_net_queue_send_iov(NetQueue *queue, qemu_net_queue_append_iov(queue, sender, flags, iov, iovcnt, sent_cb); return 0; } - - qemu_net_queue_flush(queue); + if (ret > 0) { + qemu_net_queue_flush(queue); + } return ret; } @@ -251,7 +253,7 @@ void qemu_net_queue_flush(NetQueue *queue) break; } - if (packet->sent_cb) { + if (ret > 0 && packet->sent_cb) { packet->sent_cb(packet->sender, ret); }