qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Anthony Liguori <anthony@codemonkey.ws>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [5640] Make sure to resume the monitor only after flushing out outstanding
Date: Thu, 06 Nov 2008 15:30:25 +0000	[thread overview]
Message-ID: <E1Ky6oT-00060H-7u@cvs.savannah.gnu.org> (raw)

Revision: 5640
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5640
Author:   aliguori
Date:     2008-11-06 15:30:22 +0000 (Thu, 06 Nov 2008)

Log Message:
-----------
Make sure to resume the monitor only after flushing out outstanding 
network traffic.

This was bug was reported by Chris Lalancette.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/migration-tcp.c

Modified: trunk/migration-tcp.c
===================================================================
--- trunk/migration-tcp.c	2008-11-06 09:38:51 UTC (rev 5639)
+++ trunk/migration-tcp.c	2008-11-06 15:30:22 UTC (rev 5640)
@@ -40,19 +40,11 @@
     do { } while (0)
 #endif
 
-int debug_me = 0;
-
 static void tcp_cleanup(FdMigrationState *s)
 {
-    if (s->detach == 2) {
-        monitor_resume();
-        s->detach = 0;
-    }
-
     qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL);
 
     if (s->file) {
-        debug_me = 1;
         dprintf("closing file\n");
         qemu_fclose(s->file);
     }
@@ -60,6 +52,12 @@
     if (s->fd != -1)
         close(s->fd);
 
+    /* Don't resume monitor until we've flushed all of the buffers */
+    if (s->detach == 2) {
+        monitor_resume();
+        s->detach = 0;
+    }
+
     s->fd = -1;
 }
 

                 reply	other threads:[~2008-11-06 15:30 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E1Ky6oT-00060H-7u@cvs.savannah.gnu.org \
    --to=anthony@codemonkey.ws \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).