From 907500095851230a480b14bc852c4e49d32cb16d Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Wed, 5 Aug 2009 17:07:35 +0200 Subject: [PATCH] Fix detached migration with exec. When trying to do detached migration with exec, I found that the monitor wouldn't always return in a timely manner. I tracked this down to exec_start_outgoing_migration. It appeared we were setting the fd to NONBLOCK'ing, but in point of fact we weren't. This bugfix should also go onto the stable 0.10 branch Signed-off-by: Chris Lalancette Signed-off-by: Anthony Liguori --- migration-exec.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/migration-exec.c b/migration-exec.c index e3616be5f1..ef4620f79e 100644 --- a/migration-exec.c +++ b/migration-exec.c @@ -73,10 +73,7 @@ MigrationState *exec_start_outgoing_migration(const char *command, goto err_after_open; } - if (fcntl(s->fd, F_SETFD, O_NONBLOCK) == -1) { - dprintf("Unable to set nonblocking mode on file descriptor\n"); - goto err_after_open; - } + socket_set_nonblock(s->fd); s->opaque = qemu_popen(f, "w");