From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yoshiaki Tamura Subject: [PATCH 13/19] net: insert event-tap to qemu_send_packet() and qemu_sendv_packet_async(). Date: Fri, 28 Jan 2011 16:21:46 +0900 Message-ID: <1296199312-26334-14-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1296199312-26334-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> Cc: avi@redhat.com, anthony@codemonkey.ws, aliguori@us.ibm.com, mtosatti@redhat.com, dlaor@redhat.com, mst@redhat.com, kwolf@redhat.com, ananth@in.ibm.com, psuriset@linux.vnet.ibm.com, vatsa@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com, blauwirbel@gmail.com, ohmura.kei@lab.ntt.co.jp, Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org Return-path: Received: from sh.osrg.net ([192.16.179.4]:58916 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752961Ab1A1HXp (ORCPT ); Fri, 28 Jan 2011 02:23:45 -0500 In-Reply-To: <1296199312-26334-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> Sender: kvm-owner@vger.kernel.org List-ID: 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); } -- 1.7.1.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=48357 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PiigA-0000sN-GD for qemu-devel@nongnu.org; Fri, 28 Jan 2011 02:23:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Piig6-00079W-Kj for qemu-devel@nongnu.org; Fri, 28 Jan 2011 02:23:34 -0500 Received: from sh.osrg.net ([192.16.179.4]:58323) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Piig6-000732-0c for qemu-devel@nongnu.org; Fri, 28 Jan 2011 02:23:30 -0500 From: Yoshiaki Tamura Date: Fri, 28 Jan 2011 16:21:46 +0900 Message-Id: <1296199312-26334-14-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> In-Reply-To: <1296199312-26334-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1296199312-26334-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> Subject: [Qemu-devel] [PATCH 13/19] net: insert event-tap to qemu_send_packet() and qemu_sendv_packet_async(). List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm@vger.kernel.org, qemu-devel@nongnu.org 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 , blauwirbel@gmail.com, ohmura.kei@lab.ntt.co.jp, avi@redhat.com, psuriset@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com 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); } -- 1.7.1.2