summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUri Lublin <uril@redhat.com>2009-06-08 14:28:01 +0300
committerAnthony Liguori <aliguori@us.ibm.com>2009-06-13 19:19:25 -0500
commite19252d32c45e92c919109ec32616382eb2afe6b (patch)
treede5bbeefedbe56feb5f3438b56e1bf2911ce5b5c /migration.c
parentexec-migration: handle EINTR in popen_get_buffer() (diff)
downloadqemu-kvm-e19252d32c45e92c919109ec32616382eb2afe6b.tar.gz
qemu-kvm-e19252d32c45e92c919109ec32616382eb2afe6b.tar.bz2
qemu-kvm-e19252d32c45e92c919109ec32616382eb2afe6b.zip
migrate_fd_close: delete associated io-handler before closing the fd
It may happen that the io-handler is still registered. That causes select() to return with EBADF, not calling handlers for other fds. The io-handler would be registered when (on the source) the whole state was written but not yet flushed. For example when using QEMUFileBuffered, (tcp-migration) there may be data left in a buffer waiting to be transferred. In such a case buffered_close() calls buffered_flush() which calls migrate_fd_put_buffer, which may, upon EAGAIN, register migrate_fd_put_notify as a handler. Signed-off-by: Uri Lublin <uril@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'migration.c')
-rw-r--r--migration.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/migration.c b/migration.c
index 401383cf0..57f2a5293 100644
--- a/migration.c
+++ b/migration.c
@@ -301,5 +301,7 @@ void migrate_fd_wait_for_unfreeze(void *opaque)
int migrate_fd_close(void *opaque)
{
FdMigrationState *s = opaque;
+
+ qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL);
return s->close(s);
}