From 17489dd7e9605eaac85290ba9d15211914064e59 Mon Sep 17 00:00:00 2001 From: Uri Lublin Date: Mon, 8 Jun 2009 14:28:01 +0300 Subject: [PATCH] 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. (cherry picked from commit e19252d32c45e92c919109ec32616382eb2afe6b) Signed-off-by: Uri Lublin Signed-off-by: Anthony Liguori --- migration.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/migration.c b/migration.c index 06ea795cf1..41a703af4f 100644 --- a/migration.c +++ b/migration.c @@ -283,5 +283,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); } -- 2.11.4.GIT