From: Uri Lublin Date: Mon, 8 Jun 2009 11:28:01 +0000 (+0300) Subject: migrate_fd_close: delete associated io-handler before closing the fd X-Git-Tag: v0.11.0-rc0~405 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e19252d32c45e92c919109ec32616382eb2afe6b;p=qemu-xen-4.4-testing.git 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 Signed-off-by: Anthony Liguori --- 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); }