ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: Use iov helper functions 

Signed-off-by: Benjamin Poirier <benjamin.poirier@gmail.com>
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Benjamin Poirier 2011-02-23 19:57:21 -05:00 committed by Aurelien Jarno
parent b48c20f723
commit ce0536616d
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
net.c
View File

@ -36,6 +36,7 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu_socket.h" #include "qemu_socket.h"
#include "hw/qdev.h" #include "hw/qdev.h"
#include "iov.h"
static QTAILQ_HEAD(, VLANState) vlans; static QTAILQ_HEAD(, VLANState) vlans;
static QTAILQ_HEAD(, VLANClientState) non_vlan_clients; static QTAILQ_HEAD(, VLANClientState) non_vlan_clients;
@ -572,30 +573,13 @@ static ssize_t vc_sendv_compat(VLANClientState *vc, const struct iovec *iov,
int iovcnt) int iovcnt)
{ {
uint8_t buffer[4096]; uint8_t buffer[4096];
size_t offset = 0; size_t offset;
int i;
for (i = 0; i < iovcnt; i++) { offset = iov_to_buf(iov, iovcnt, buffer, 0, sizeof(buffer));
size_t len;
len = MIN(sizeof(buffer) - offset, iov[i].iov_len);
memcpy(buffer + offset, iov[i].iov_base, len);
offset += len;
}
return vc->info->receive(vc, buffer, offset); return vc->info->receive(vc, buffer, offset);
} }
static ssize_t calc_iov_length(const struct iovec *iov, int iovcnt)
{
size_t offset = 0;
int i;
for (i = 0; i < iovcnt; i++)
offset += iov[i].iov_len;
return offset;
}
static ssize_t qemu_deliver_packet_iov(VLANClientState *sender, static ssize_t qemu_deliver_packet_iov(VLANClientState *sender,
unsigned flags, unsigned flags,
const struct iovec *iov, const struct iovec *iov,
@ -605,7 +589,7 @@ static ssize_t qemu_deliver_packet_iov(VLANClientState *sender,
VLANClientState *vc = opaque; VLANClientState *vc = opaque;
if (vc->link_down) { if (vc->link_down) {
return calc_iov_length(iov, iovcnt); return iov_size(iov, iovcnt);
} }
if (vc->info->receive_iov) { if (vc->info->receive_iov) {
@ -633,7 +617,7 @@ static ssize_t qemu_vlan_deliver_packet_iov(VLANClientState *sender,
} }
if (vc->link_down) { if (vc->link_down) {
ret = calc_iov_length(iov, iovcnt); ret = iov_size(iov, iovcnt);
continue; continue;
} }
@ -658,7 +642,7 @@ ssize_t qemu_sendv_packet_async(VLANClientState *sender,
NetQueue *queue; NetQueue *queue;
if (sender->link_down || (!sender->peer && !sender->vlan)) { if (sender->link_down || (!sender->peer && !sender->vlan)) {
return calc_iov_length(iov, iovcnt); return iov_size(iov, iovcnt);
} }
if (sender->peer) { if (sender->peer) {