- Initialize TCP/UDP socket list, ethernet buffer list. - Allocate memory for ethernet buffer.
Signed-off-by: Asias He <[email protected]> --- tools/kvm/Makefile | 1 + tools/kvm/include/kvm/uip.h | 2 + tools/kvm/uip/core.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 0 deletions(-) create mode 100644 tools/kvm/uip/core.c diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile index c088718..733769d 100644 --- a/tools/kvm/Makefile +++ b/tools/kvm/Makefile @@ -45,6 +45,7 @@ OBJS += disk/qcow.o OBJS += disk/raw.o OBJS += ioeventfd.o OBJS += irq.o +OBJS += uip/core.o OBJS += uip/arp.o OBJS += uip/icmp.o OBJS += uip/ipv4.o diff --git a/tools/kvm/include/kvm/uip.h b/tools/kvm/include/kvm/uip.h index 893c5f8..c300de0 100644 --- a/tools/kvm/include/kvm/uip.h +++ b/tools/kvm/include/kvm/uip.h @@ -267,6 +267,8 @@ static inline u16 uip_eth_hdrlen(struct uip_eth *eth) return sizeof(*eth); } +int uip_init(struct uip_info *info); + int uip_tx_do_ipv4_icmp(struct uip_tx_arg *arg); int uip_tx_do_ipv4_tcp(struct uip_tx_arg *arg); int uip_tx_do_ipv4_udp(struct uip_tx_arg *arg); diff --git a/tools/kvm/uip/core.c b/tools/kvm/uip/core.c new file mode 100644 index 0000000..58eba6b --- /dev/null +++ b/tools/kvm/uip/core.c @@ -0,0 +1,58 @@ +#include "kvm/mutex.h" +#include "kvm/uip.h" + +#include <linux/virtio_net.h> +#include <linux/kernel.h> +#include <linux/list.h> + +int uip_init(struct uip_info *info) +{ + struct list_head *udp_socket_head; + struct list_head *tcp_socket_head; + struct list_head *buf_head; + struct uip_buf *buf; + int buf_nr; + int i; + + udp_socket_head = &info->udp_socket_head; + tcp_socket_head = &info->tcp_socket_head; + buf_head = &info->buf_head; + buf_nr = info->buf_nr; + + INIT_LIST_HEAD(udp_socket_head); + INIT_LIST_HEAD(tcp_socket_head); + INIT_LIST_HEAD(buf_head); + + pthread_mutex_init(&info->udp_socket_lock, NULL); + pthread_mutex_init(&info->tcp_socket_lock, NULL); + pthread_mutex_init(&info->buf_lock, NULL); + + pthread_cond_init(&info->buf_used_cond, NULL); + pthread_cond_init(&info->buf_free_cond, NULL); + + + for (i = 0; i < buf_nr; i++) { + buf = malloc(sizeof(*buf)); + memset(buf, 0, sizeof(*buf)); + + buf->status = UIP_BUF_STATUS_FREE; + buf->info = info; + buf->id = i; + list_add_tail(&buf->list, buf_head); + } + + list_for_each_entry(buf, buf_head, list) { + buf->vnet = malloc(sizeof(struct virtio_net_hdr)); + buf->vnet_len = sizeof(struct virtio_net_hdr); + buf->eth = malloc(1024*64 + sizeof(struct uip_pseudo_hdr)); + buf->eth_len = 1024*64 + sizeof(struct uip_pseudo_hdr); + + memset(buf->vnet, 0, buf->vnet_len); + memset(buf->eth, 0, buf->eth_len); + } + + info->buf_free_nr = buf_nr; + info->buf_used_nr = 0; + + return 0; +} -- 1.7.5.4 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
