From patchwork Thu Jan 13 17:15:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 78805 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2E790B7043 for ; Fri, 14 Jan 2011 05:32:03 +1100 (EST) Received: from localhost ([127.0.0.1]:56469 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PdROU-000629-6X for incoming@patchwork.ozlabs.org; Thu, 13 Jan 2011 12:55:30 -0500 Received: from [140.186.70.92] (port=38277 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PdQqK-0008D9-Mo for qemu-devel@nongnu.org; Thu, 13 Jan 2011 12:20:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PdQqF-0007G2-Un for qemu-devel@nongnu.org; Thu, 13 Jan 2011 12:20:12 -0500 Received: from sh.osrg.net ([192.16.179.4]:42678) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PdQqF-0007FU-F7 for qemu-devel@nongnu.org; Thu, 13 Jan 2011 12:20:07 -0500 Received: from fs.osrg.net (postfix@fs.osrg.net [10.0.0.12]) by sh.osrg.net (8.14.3/8.14.3/OSRG-NET) with ESMTP id p0DHJhBK031752; Fri, 14 Jan 2011 02:19:46 +0900 Received: from localhost (hype-nh0.osrg.net [10.72.1.48]) by fs.osrg.net (Postfix) with ESMTP id 971931B800C; Fri, 14 Jan 2011 02:19:40 +0900 (JST) From: Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org Date: Fri, 14 Jan 2011 02:15:35 +0900 Message-Id: <1294938941-9532-14-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.1.2 In-Reply-To: <1294938941-9532-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1294938941-9532-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 44 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Fri, 14 Jan 2011 02:19:47 +0900 (JST) X-Virus-Scanned: clamav-milter 0.96.5 at sh X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: kwolf@redhat.com, aliguori@us.ibm.com, mtosatti@redhat.com, ananth@in.ibm.com, mst@redhat.com, dlaor@redhat.com, vatsa@linux.vnet.ibm.com, Yoshiaki Tamura , ohmura.kei@lab.ntt.co.jp, avi@redhat.com, psuriset@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 13/19] net: insert event-tap to qemu_send_packet() and qemu_sendv_packet_async(). X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org event-tap function is called only when it is on. Signed-off-by: Yoshiaki Tamura --- net.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/net.c b/net.c index 9ba5be2..1176124 100644 --- a/net.c +++ b/net.c @@ -36,6 +36,7 @@ #include "qemu-common.h" #include "qemu_socket.h" #include "hw/qdev.h" +#include "event-tap.h" static QTAILQ_HEAD(, VLANState) vlans; static QTAILQ_HEAD(, VLANClientState) non_vlan_clients; @@ -559,6 +560,10 @@ ssize_t qemu_send_packet_async(VLANClientState *sender, void qemu_send_packet(VLANClientState *vc, const uint8_t *buf, int size) { + if (event_tap_is_on()) { + return event_tap_send_packet(vc, buf, size); + } + qemu_send_packet_async(vc, buf, size, NULL); } @@ -657,6 +662,10 @@ ssize_t qemu_sendv_packet_async(VLANClientState *sender, { NetQueue *queue; + if (event_tap_is_on()) { + return event_tap_sendv_packet_async(sender, iov, iovcnt, sent_cb); + } + if (sender->link_down || (!sender->peer && !sender->vlan)) { return calc_iov_length(iov, iovcnt); }