summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-17 18:06:27 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-17 18:06:27 +0000
commit0ee50993ce7bd5e4e9d3729bcb4fc9f8567436ee (patch)
treed909e6856f9c4a2c3d34f935bf9694ca834dda9f
parent7020c09209973faf626f68bc513ca6d6ab234ae7 (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/branches/stable_0_10@7153 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 dc00787e28..f299685663 100644
--- a/net.c
+++ b/net.c
@@ -698,7 +698,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)
{
@@ -711,7 +710,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)
{
@@ -758,9 +756,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;