[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [5640] Make sure to resume the monitor only after flushing
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [5640] Make sure to resume the monitor only after flushing out outstanding |
Date: |
Thu, 06 Nov 2008 15:30:25 +0000 |
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 <address@hidden>
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;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [5640] Make sure to resume the monitor only after flushing out outstanding,
Anthony Liguori <=