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

virtio-net: remove useless codes

Browse Source 
After commit 40bad8f3deba15e2074ff34cfe923c12916b1cc5("virtio-net: fix
used len for tx"), async_tx.len was no longer used afterwards. So
remove useless codes with it.

Signed-off-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Jason Wang 2015-08-03 13:20:38 +08:00 committed by Michael S. Tsirkin
parent e402463073
commit bd89dd98b2
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/net/virtio-net.c
View File

@ -1124,7 +1124,7 @@ static void virtio_net_tx_complete(NetClientState *nc, ssize_t len)
virtqueue_push(q->tx_vq, &q->async_tx.elem, 0); virtqueue_push(q->tx_vq, &q->async_tx.elem, 0);
virtio_notify(vdev, q->tx_vq); virtio_notify(vdev, q->tx_vq);
q->async_tx.elem.out_num = q->async_tx.len = 0; q->async_tx.elem.out_num = 0;
virtio_queue_set_notification(q->tx_vq, 1); virtio_queue_set_notification(q->tx_vq, 1);
virtio_net_flush_tx(q); virtio_net_flush_tx(q);
@ -1148,7 +1148,7 @@ static int32_t virtio_net_flush_tx(VirtIONetQueue *q)
} }
while (virtqueue_pop(q->tx_vq, &elem)) { while (virtqueue_pop(q->tx_vq, &elem)) {
ssize_t ret, len; ssize_t ret;
unsigned int out_num = elem.out_num; unsigned int out_num = elem.out_num;
struct iovec *out_sg = &elem.out_sg[0]; struct iovec *out_sg = &elem.out_sg[0];
struct iovec sg[VIRTQUEUE_MAX_SIZE], sg2[VIRTQUEUE_MAX_SIZE + 1]; struct iovec sg[VIRTQUEUE_MAX_SIZE], sg2[VIRTQUEUE_MAX_SIZE + 1];
@ -1196,18 +1196,14 @@ static int32_t virtio_net_flush_tx(VirtIONetQueue *q)
out_sg = sg; out_sg = sg;
} }
len = n->guest_hdr_len;
ret = qemu_sendv_packet_async(qemu_get_subqueue(n->nic, queue_index), ret = qemu_sendv_packet_async(qemu_get_subqueue(n->nic, queue_index),
out_sg, out_num, virtio_net_tx_complete); out_sg, out_num, virtio_net_tx_complete);
if (ret == 0) { if (ret == 0) {
virtio_queue_set_notification(q->tx_vq, 0); virtio_queue_set_notification(q->tx_vq, 0);
q->async_tx.elem = elem; q->async_tx.elem = elem;
q->async_tx.len = len;
return -EBUSY; return -EBUSY;
} }
len += ret;
drop: drop:
virtqueue_push(q->tx_vq, &elem, 0); virtqueue_push(q->tx_vq, &elem, 0);
virtio_notify(vdev, q->tx_vq); virtio_notify(vdev, q->tx_vq);

1
include/hw/virtio/virtio-net.h
View File

@ -48,7 +48,6 @@ typedef struct VirtIONetQueue {
int tx_waiting; int tx_waiting;
struct { struct {
VirtQueueElement elem; VirtQueueElement elem;
ssize_t len;
} async_tx; } async_tx;
struct VirtIONet *n; struct VirtIONet *n;
} VirtIONetQueue; } VirtIONetQueue;