From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lu7zX-0008Ja-Hr for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:29:39 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lu7zS-0008GH-B5 for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:29:38 -0400 Received: from [199.232.76.173] (port=54431 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lu7zR-0008FY-EI for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:29:33 -0400 Received: from mail21.svc.cra.dublin.eircom.net ([159.134.118.222]:31172) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1Lu7zQ-00062N-K9 for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:29:33 -0400 From: Mark McLoughlin Date: Wed, 15 Apr 2009 17:29:22 +0100 Message-Id: <1239812969-8320-3-git-send-email-markmc@redhat.com> In-Reply-To: <1239812969-8320-2-git-send-email-markmc@redhat.com> References: <1239812969-8320-1-git-send-email-markmc@redhat.com> <1239812969-8320-2-git-send-email-markmc@redhat.com> Subject: [Qemu-devel] [PATCH 2/9] struct iovec is now universally available Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Jan Kiszka , qemu-devel@nongnu.org, Mark McLoughlin struct iovec is now defined in qemu-common.h if needed, so we don't need the tap code to handle !defined(HAVE_IOVEC). Signed-off-by: Mark McLoughlin --- net.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/net.c b/net.c index 5365891..5e6895c 100644 --- a/net.c +++ b/net.c @@ -702,7 +702,6 @@ typedef struct TAPState { char down_script_arg[128]; } TAPState; -#ifdef HAVE_IOVEC static ssize_t tap_receive_iov(void *opaque, const struct iovec *iov, int iovcnt) { @@ -715,7 +714,6 @@ static ssize_t tap_receive_iov(void *opaque, const struct iovec *iov, return len; } -#endif static void tap_receive(void *opaque, const uint8_t *buf, int size) { @@ -762,9 +760,7 @@ static TAPState *net_tap_fd_init(VLANState *vlan, s = qemu_mallocz(sizeof(TAPState)); s->fd = fd; s->vc = qemu_new_vlan_client(vlan, model, name, tap_receive, NULL, s); -#ifdef HAVE_IOVEC s->vc->fd_readv = tap_receive_iov; -#endif qemu_set_fd_handler(s->fd, tap_send, NULL, s); snprintf(s->vc->info_str, sizeof(s->vc->info_str), "fd=%d", fd); return s; -- 1.6.0.6