mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: complete all queued packets on VM stop

Browse Source 
This completes all packets, ensuring that callbacks
will not run when VM is stopped.

Cc: qemu-stable@nongnu.org
Cc: Jason Wang <jasowang@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2014-09-04 11:39:13 +03:00 committed by Stefan Hajnoczi
parent 07d8084624
commit ca77d85e1d
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
net/net.c
View File

@ -48,6 +48,7 @@
# define CONFIG_NET_BRIDGE # define CONFIG_NET_BRIDGE
#endif #endif
static VMChangeStateEntry *net_change_state_entry;
static QTAILQ_HEAD(, NetClientState) net_clients; static QTAILQ_HEAD(, NetClientState) net_clients;
const char *host_net_devices[] = { const char *host_net_devices[] = {
@ -511,7 +512,8 @@ void qemu_purge_queued_packets(NetClientState *nc)
qemu_net_queue_purge(nc->peer->incoming_queue, nc); qemu_net_queue_purge(nc->peer->incoming_queue, nc);
} }
void qemu_flush_queued_packets(NetClientState *nc) static
void qemu_flush_or_purge_queued_packets(NetClientState *nc, bool purge)
{ {
nc->receive_disabled = 0; nc->receive_disabled = 0;
@ -525,9 +527,17 @@ void qemu_flush_queued_packets(NetClientState *nc)
* the file descriptor (for tap, for example). * the file descriptor (for tap, for example).
*/ */
qemu_notify_event(); qemu_notify_event();
} else if (purge) {
/* Unable to empty the queue, purge remaining packets */
qemu_net_queue_purge(nc->incoming_queue, nc);
} }
} }
void qemu_flush_queued_packets(NetClientState *nc)
{
qemu_flush_or_purge_queued_packets(nc, false);
}
static ssize_t qemu_send_packet_async_with_flags(NetClientState *sender, static ssize_t qemu_send_packet_async_with_flags(NetClientState *sender,
unsigned flags, unsigned flags,
const uint8_t *buf, int size, const uint8_t *buf, int size,
@ -1175,6 +1185,22 @@ void qmp_set_link(const char *name, bool up, Error **errp)
} }
} }
static void net_vm_change_state_handler(void *opaque, int running,
RunState state)
{
/* Complete all queued packets, to guarantee we don't modify
* state later when VM is not running.
*/
if (!running) {
NetClientState *nc;
NetClientState *tmp;
QTAILQ_FOREACH_SAFE(nc, &net_clients, next, tmp) {
qemu_flush_or_purge_queued_packets(nc, true);
}
}
}
void net_cleanup(void) void net_cleanup(void)
{ {
NetClientState *nc; NetClientState *nc;
@ -1190,6 +1216,8 @@ void net_cleanup(void)
qemu_del_net_client(nc); qemu_del_net_client(nc);
} }
} }
qemu_del_vm_change_state_handler(net_change_state_entry);
} }
void net_check_clients(void) void net_check_clients(void)
@ -1275,6 +1303,9 @@ int net_init_clients(void)
#endif #endif
} }
net_change_state_entry =
qemu_add_vm_change_state_handler(net_vm_change_state_handler, NULL);
QTAILQ_INIT(&net_clients); QTAILQ_INIT(&net_clients);
if (qemu_opts_foreach(qemu_find_opts("netdev"), net_init_netdev, NULL, 1) == -1) if (qemu_opts_foreach(qemu_find_opts("netdev"), net_init_netdev, NULL, 1) == -1)