virtio-net: simplify rx code
Remove code duplication using guest header length that we track. Drop specific layout requirement for rx buffers: things work using generic iovec functions in any case. Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
14761f9cf7
commit
7b80d08efc
|
@ -720,12 +720,7 @@ static int32_t virtio_net_flush_tx(VirtIONet *n, VirtQueue *vq)
|
||||||
struct iovec *out_sg = &elem.out_sg[0];
|
struct iovec *out_sg = &elem.out_sg[0];
|
||||||
struct iovec sg[VIRTQUEUE_MAX_SIZE];
|
struct iovec sg[VIRTQUEUE_MAX_SIZE];
|
||||||
|
|
||||||
/* hdr_len refers to the header received from the guest */
|
if (out_num < 1) {
|
||||||
hdr_len = n->mergeable_rx_bufs ?
|
|
||||||
sizeof(struct virtio_net_hdr_mrg_rxbuf) :
|
|
||||||
sizeof(struct virtio_net_hdr);
|
|
||||||
|
|
||||||
if (out_num < 1 || out_sg->iov_len != hdr_len) {
|
|
||||||
error_report("virtio-net header not in first element");
|
error_report("virtio-net header not in first element");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
@ -747,7 +742,7 @@ static int32_t virtio_net_flush_tx(VirtIONet *n, VirtQueue *vq)
|
||||||
out_sg = sg;
|
out_sg = sg;
|
||||||
}
|
}
|
||||||
|
|
||||||
len = hdr_len;
|
len = n->guest_hdr_len;
|
||||||
|
|
||||||
ret = qemu_sendv_packet_async(&n->nic->nc, out_sg, out_num,
|
ret = qemu_sendv_packet_async(&n->nic->nc, out_sg, out_num,
|
||||||
virtio_net_tx_complete);
|
virtio_net_tx_complete);
|
||||||
|
|
Loading…
Reference in a new issue