Commit bd89dd98 authored by Jason Wang's avatar Jason Wang Committed by Michael S. Tsirkin
Browse files

virtio-net: remove useless codes 



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

Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent e4024630

hw/net/virtio-net.c

+2 −6
Original line number Diff line number Diff line
@@ -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);

    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_net_flush_tx(q);
@@ -1148,7 +1148,7 @@ static int32_t virtio_net_flush_tx(VirtIONetQueue *q) 
    }



    while (virtqueue_pop(q->tx_vq, &elem)) {

        ssize_t ret, len;

        ssize_t ret;

        unsigned int out_num = elem.out_num;

        struct iovec *out_sg = &elem.out_sg[0];

        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;

        }



        len = n->guest_hdr_len;



        ret = qemu_sendv_packet_async(qemu_get_subqueue(n->nic, queue_index),

                                      out_sg, out_num, virtio_net_tx_complete);

        if (ret == 0) {

            virtio_queue_set_notification(q->tx_vq, 0);

            q->async_tx.elem = elem;

            q->async_tx.len  = len;

            return -EBUSY;

        }



        len += ret;

drop:

        virtqueue_push(q->tx_vq, &elem, 0);

        virtio_notify(vdev, q->tx_vq);

include/hw/virtio/virtio-net.h

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ typedef struct VirtIONetQueue { 
    int tx_waiting;

    struct {

        VirtQueueElement elem;

        ssize_t len;

    } async_tx;

    struct VirtIONet *n;

} VirtIONetQueue;