Commit 067404be authored by Jan Kiszka's avatar Jan Kiszka Committed by Stefan Hajnoczi
Browse files

net: Rename send_queue to incoming_queue 



Each networking client has a queue for packets that could not yet be
delivered to that client. Calling this queue "send_queue" is highly
confusing as it has nothing to to with packets send from this client but
to it. Avoid this confusing by renaming it to "incoming_queue".

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent aa4f082f

include/net/net.h

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ struct NetClientState { 
    int link_down;

    QTAILQ_ENTRY(NetClientState) next;

    NetClientState *peer;

    NetQueue *send_queue;

    NetQueue *incoming_queue;

    char *model;

    char *name;

    char info_str[256];

net/hub.c

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ bool net_hub_flush(NetClientState *nc) 


    QLIST_FOREACH(port, &source_port->hub->ports, next) {

        if (port != source_port) {

            ret += qemu_net_queue_flush(port->nc.send_queue);

            ret += qemu_net_queue_flush(port->nc.incoming_queue);

        }

    }

    return ret ? true : false;

net/net.c

+7 −7
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static void qemu_net_client_setup(NetClientState *nc, 
    }

    QTAILQ_INSERT_TAIL(&net_clients, nc, next);



    nc->send_queue = qemu_new_net_queue(nc);

    nc->incoming_queue = qemu_new_net_queue(nc);

    nc->destructor = destructor;

}
@@ -289,8 +289,8 @@ static void qemu_cleanup_net_client(NetClientState *nc) 


static void qemu_free_net_client(NetClientState *nc)

{

    if (nc->send_queue) {

        qemu_del_net_queue(nc->send_queue);

    if (nc->incoming_queue) {

        qemu_del_net_queue(nc->incoming_queue);

    }

    if (nc->peer) {

        nc->peer->peer = NULL;
@@ -431,7 +431,7 @@ void qemu_purge_queued_packets(NetClientState *nc) 
        return;

    }



    qemu_net_queue_purge(nc->peer->send_queue, nc);

    qemu_net_queue_purge(nc->peer->incoming_queue, nc);

}



void qemu_flush_queued_packets(NetClientState *nc)
@@ -444,7 +444,7 @@ void qemu_flush_queued_packets(NetClientState *nc) 
        }

        return;

    }

    if (qemu_net_queue_flush(nc->send_queue)) {

    if (qemu_net_queue_flush(nc->incoming_queue)) {

        /* We emptied the queue successfully, signal to the IO thread to repoll

         * the file descriptor (for tap, for example).

         */
@@ -468,7 +468,7 @@ static ssize_t qemu_send_packet_async_with_flags(NetClientState *sender, 
        return size;

    }



    queue = sender->peer->send_queue;

    queue = sender->peer->incoming_queue;



    return qemu_net_queue_send(queue, sender, flags, buf, size, sent_cb);

}
@@ -543,7 +543,7 @@ ssize_t qemu_sendv_packet_async(NetClientState *sender, 
        return iov_size(iov, iovcnt);

    }



    queue = sender->peer->send_queue;

    queue = sender->peer->incoming_queue;



    return qemu_net_queue_send_iov(queue, sender,

                                   QEMU_NET_PACKET_FLAG_NONE,