aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-17 17:10:39 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-17 17:10:39 +0000
commitefb816c9a8f0c4170785283dad4124a2ed451b94 (patch)
tree0e72a79f11e8ad81761863e994638eab5c2bcfd2
parent559a8f45f34cc50d1a60b4f67a06614d506b2e01 (diff)
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 <markmc@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7143 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--net.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net.c b/net.c
index 536589130b..5e6895c502 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;