Skip to content
Snippets Groups Projects
Commit 0cbbf253 authored by Chris Lalancette's avatar Chris Lalancette Committed by Glauber Costa
Browse files

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: default avatarChris Lalancette <clalance@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
Signed-off-by: default avatarGlauber Costa <glommer@redhat.com>
parent f3c7245f
No related branches found
No related tags found
No related merge requests found
...@@ -74,10 +74,7 @@ MigrationState *exec_start_outgoing_migration(const char *command, ...@@ -74,10 +74,7 @@ MigrationState *exec_start_outgoing_migration(const char *command,
goto err_after_open; goto err_after_open;
} }
if (fcntl(s->fd, F_SETFD, O_NONBLOCK) == -1) { socket_set_nonblock(s->fd);
dprintf("Unable to set nonblocking mode on file descriptor\n");
goto err_after_open;
}
s->opaque = qemu_popen(f, "w"); s->opaque = qemu_popen(f, "w");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment