haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

virtio-net: refactor receive_hdr

Browse source 
Now that we know host hdr length, we don't need to
duplicate the logic in receive_hdr: caller can
figure out the offset itself.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2012-09-24 13:24:17 +02:00
parent 63c5872873
commit 280598b7a5
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
hw/virtio-net.c
View file

@ -516,17 +516,15 @@ static void work_around_broken_dhclient(struct virtio_net_hdr *hdr,
} }
} }
static int receive_header(VirtIONet *n, const struct iovec *iov, int iov_cnt, static void receive_header(VirtIONet *n, const struct iovec *iov, int iov_cnt,
const void *buf, size_t size) const void *buf, size_t size)
{ {
int offset = 0;
if (n->has_vnet_hdr) { if (n->has_vnet_hdr) {
/* FIXME this cast is evil */ /* FIXME this cast is evil */
void *wbuf = (void *)buf; void *wbuf = (void *)buf;
work_around_broken_dhclient(wbuf, wbuf + offset, size - offset); work_around_broken_dhclient(wbuf, wbuf + n->host_hdr_len,
offset = sizeof(struct virtio_net_hdr); size - n->host_hdr_len);
iov_from_buf(iov, iov_cnt, 0, buf, offset); iov_from_buf(iov, iov_cnt, 0, buf, sizeof(struct virtio_net_hdr));
} else { } else {
struct virtio_net_hdr hdr = { struct virtio_net_hdr hdr = {
.flags = 0, .flags = 0,
@ -534,8 +532,6 @@ static int receive_header(VirtIONet *n, const struct iovec *iov, int iov_cnt,
}; };
iov_from_buf(iov, iov_cnt, 0, &hdr, sizeof hdr); iov_from_buf(iov, iov_cnt, 0, &hdr, sizeof hdr);
} }
return offset;
} }
static int receive_filter(VirtIONet *n, const uint8_t *buf, int size) static int receive_filter(VirtIONet *n, const uint8_t *buf, int size)
@ -642,8 +638,8 @@ static ssize_t virtio_net_receive(NetClientState *nc, const uint8_t *buf, size_t
sizeof(mhdr.num_buffers)); sizeof(mhdr.num_buffers));
} }
offset += receive_header(n, sg, elem.in_num, receive_header(n, sg, elem.in_num, buf + offset, size - offset);
buf + offset, size - offset); offset += n->host_hdr_len;
total += n->guest_hdr_len; total += n->guest_hdr_len;
guest_offset = n->guest_hdr_len; guest_offset = n->guest_hdr_len;
} else { } else {