Skip to content

Commit

Permalink
net: Rename send_queue to incoming_queue
Browse files Browse the repository at this point in the history
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: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
  • Loading branch information
jan-kiszka authored and stefanhaRH committed Sep 6, 2013
1 parent aa4f082 commit 067404b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion include/net/net.h
Expand Up @@ -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];
Expand Down
2 changes: 1 addition & 1 deletion net/hub.c
Expand Up @@ -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;
Expand Down
14 changes: 7 additions & 7 deletions net/net.c
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand All @@ -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).
*/
Expand All @@ -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);
}
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 067404b

Please sign in to comment.