From patchwork Mon Apr 25 11:00:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: OHMURA Kei X-Patchwork-Id: 92730 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 DA5CEB6EF3 for ; Mon, 25 Apr 2011 21:06:14 +1000 (EST) Received: from localhost ([::1]:40798 helo=lists2.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QEJcJ-0002mU-Ta for incoming@patchwork.ozlabs.org; Mon, 25 Apr 2011 07:06:11 -0400 Received: from eggs.gnu.org ([140.186.70.92]:43569) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QEJaY-0000ED-SB for qemu-devel@nongnu.org; Mon, 25 Apr 2011 07:04:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QEJaX-0004qk-Ky for qemu-devel@nongnu.org; Mon, 25 Apr 2011 07:04:22 -0400 Received: from sh.osrg.net ([192.16.179.4]:50517) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QEJaX-0004pT-3W for qemu-devel@nongnu.org; Mon, 25 Apr 2011 07:04:21 -0400 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 p3PB43iW017083; Mon, 25 Apr 2011 20:04:03 +0900 Received: from localhost (klift-nh0.osrg.net [10.84.0.5]) by fs.osrg.net (Postfix) with ESMTP id 2EA4A3E030C; Mon, 25 Apr 2011 20:04:01 +0900 (JST) From: OHMURA Kei To: qemu-devel@nongnu.org, kvm@vger.kernel.org Date: Mon, 25 Apr 2011 20:00:52 +0900 Message-Id: <1303729257-9034-14-git-send-email-ohmura.kei@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.0.2 In-Reply-To: <1303729257-9034-1-git-send-email-ohmura.kei@lab.ntt.co.jp> References: <1303729257-9034-1-git-send-email-ohmura.kei@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 47 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Mon, 25 Apr 2011 20:04:05 +0900 (JST) X-Virus-Scanned: clamav-milter 0.97 at sh X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 192.16.179.4 Cc: kwolf@redhat.com, aliguori@us.ibm.com, mtosatti@redhat.com, ohmura.kei@lab.ntt.co.jp, ananth@in.ibm.com, mst@redhat.com, dlaor@redhat.com, vatsa@linux.vnet.ibm.com, Yoshiaki Tamura , blauwirbel@gmail.com, quintela@redhat.com, tamura.yoshiaki@gmail.com, avi@redhat.com, pbonzini@redhat.com, psuriset@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 13/18] net: insert event-tap to qemu_send_packet() and qemu_sendv_packet_async(). 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 From: Yoshiaki Tamura event-tap function is called only when it is on. Signed-off-by: Yoshiaki Tamura Signed-off-by: OHMURA Kei --- net.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/net.c b/net.c index 4f777c3..8bcc504 100644 --- a/net.c +++ b/net.c @@ -36,6 +36,7 @@ #include "qemu_socket.h" #include "hw/qdev.h" #include "iov.h" +#include "event-tap.h" static QTAILQ_HEAD(, VLANState) vlans; static QTAILQ_HEAD(, VLANClientState) non_vlan_clients; @@ -518,6 +519,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); } @@ -599,6 +604,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 iov_size(iov, iovcnt); }