From: aliguori Date: Fri, 17 Apr 2009 17:10:39 +0000 (+0000) Subject: struct iovec is now universally available (Mark McLoughlin) X-Git-Tag: TizenStudio_2.0_p2.3~9142 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8cf8af6033d458a975580840dd33bc2ddd71b6bb;p=sdk%2Femulator%2Fqemu.git struct iovec is now universally available (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 Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7143 c046a42c-6fe2-441c-8c8c-71466251a162 --- 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;