david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio-net: first s/g is always at start of buf

Browse Source 
We know offset is 0, assert that.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2012-09-24 13:26:55 +02:00
parent 280598b7a5
commit c8d28e7e33
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/virtio-net.c
View File

@ -631,6 +631,7 @@ static ssize_t virtio_net_receive(NetClientState *nc, const uint8_t *buf, size_t
} }
if (i == 0) { if (i == 0) {
assert(offset == 0);
if (n->mergeable_rx_bufs) { if (n->mergeable_rx_bufs) {
mhdr_cnt = iov_copy(mhdr_sg, ARRAY_SIZE(mhdr_sg), mhdr_cnt = iov_copy(mhdr_sg, ARRAY_SIZE(mhdr_sg),
sg, elem.in_num, sg, elem.in_num,
@ -638,8 +639,8 @@ static ssize_t virtio_net_receive(NetClientState *nc, const uint8_t *buf, size_t
sizeof(mhdr.num_buffers)); sizeof(mhdr.num_buffers));
} }
receive_header(n, sg, elem.in_num, buf + offset, size - offset); receive_header(n, sg, elem.in_num, buf, size);
offset += n->host_hdr_len; 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 {