gwj / at91sam9263 · Commits

Commit efb816c9a8f0c4170785283dad4124a2ed451b94

Authored by aliguori
1 parent 559a8f45

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
Inline Side-by-side
Showing 1 changed file with 0 additions and 4 deletions
@@ -702,7 +702,6 @@ typedef struct TAPState { @@ -702,7 +702,6 @@ typedef struct TAPState {
702 char down_script_arg[128]; 702 char down_script_arg[128];
703 } TAPState; 703 } TAPState;
704 704
705 -#ifdef HAVE_IOVEC  
706 static ssize_t tap_receive_iov(void *opaque, const struct iovec *iov, 705 static ssize_t tap_receive_iov(void *opaque, const struct iovec *iov,
707 int iovcnt) 706 int iovcnt)
708 { 707 {
@@ -715,7 +714,6 @@ static ssize_t tap_receive_iov(void *opaque, const struct iovec *iov, @@ -715,7 +714,6 @@ static ssize_t tap_receive_iov(void *opaque, const struct iovec *iov,
715 714
716 return len; 715 return len;
717 } 716 }
718 -#endif  
719 717
720 static void tap_receive(void *opaque, const uint8_t *buf, int size) 718 static void tap_receive(void *opaque, const uint8_t *buf, int size)
721 { 719 {
@@ -762,9 +760,7 @@ static TAPState *net_tap_fd_init(VLANState *vlan, @@ -762,9 +760,7 @@ static TAPState *net_tap_fd_init(VLANState *vlan,
762 s = qemu_mallocz(sizeof(TAPState)); 760 s = qemu_mallocz(sizeof(TAPState));
763 s->fd = fd; 761 s->fd = fd;
764 s->vc = qemu_new_vlan_client(vlan, model, name, tap_receive, NULL, s); 762 s->vc = qemu_new_vlan_client(vlan, model, name, tap_receive, NULL, s);
765 -#ifdef HAVE_IOVEC  
766 s->vc->fd_readv = tap_receive_iov; 763 s->vc->fd_readv = tap_receive_iov;
767 -#endif  
768 qemu_set_fd_handler(s->fd, tap_send, NULL, s); 764 qemu_set_fd_handler(s->fd, tap_send, NULL, s);
769 snprintf(s->vc->info_str, sizeof(s->vc->info_str), "fd=%d", fd); 765 snprintf(s->vc->info_str, sizeof(s->vc->info_str), "fd=%d", fd);
770 return s; 766 return s;