From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41325) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCHZU-0000Eh-4N for qemu-devel@nongnu.org; Mon, 06 Jul 2015 21:21:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCHZQ-0001pL-H2 for qemu-devel@nongnu.org; Mon, 06 Jul 2015 21:21:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43138) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCHZQ-0001pH-C9 for qemu-devel@nongnu.org; Mon, 06 Jul 2015 21:21:12 -0400 From: Fam Zheng Date: Tue, 7 Jul 2015 09:21:07 +0800 Message-Id: <1436232067-29144-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v2] net: Flush queued packets when guest resumes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jcmvbkbc@gmail.com, Jason Wang , Stefan Hajnoczi , mst@redhat.com Since commit 6e99c63 "net/socket: Drop net_socket_can_send" and friends, net queues need to be explicitly flushed after qemu_can_send_packet() returns false, because the netdev side will disable the polling of fd. This fixes the case of "cont" after "stop" (or migration). Signed-off-by: Fam Zheng --- v2: Unify with VM stop handler. (Stefan) --- net/net.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/net/net.c b/net/net.c index 6ff7fec..28a5597 100644 --- a/net/net.c +++ b/net/net.c @@ -1257,14 +1257,19 @@ 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; + NetClientState *nc; + NetClientState *tmp; - QTAILQ_FOREACH_SAFE(nc, &net_clients, next, tmp) { + QTAILQ_FOREACH_SAFE(nc, &net_clients, next, tmp) { + if (running) { + /* Flush queued packets and wake up backends. */ + if (nc->peer && qemu_can_send_packet(nc)) { + qemu_flush_queued_packets(nc->peer); + } + } else { + /* Complete all queued packets, to guarantee we don't modify + * state later when VM is not running. + */ qemu_flush_or_purge_queued_packets(nc, true); } } -- 2.4.3