diff options
author | Fathi Boudra <fathi.boudra@linaro.org> | 2013-03-30 21:18:24 +0200 |
---|---|---|
committer | Fathi Boudra <fathi.boudra@linaro.org> | 2013-03-30 21:18:24 +0200 |
commit | 050a840ead5e51a1a9f3bffe89cc89077b2f35ed (patch) | |
tree | 36d8e48e23b64a07a914b3b34d568c747915b560 /migration-exec.c | |
parent | 17d4e9b1e2d6d32da51278a4165621af99bade02 (diff) |
Imported Upstream version 1.4.0-2013.03upstream/1.4.0-2013.03
Diffstat (limited to 'migration-exec.c')
-rw-r--r-- | migration-exec.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/migration-exec.c b/migration-exec.c index 2b6fcb4..a051a6e 100644 --- a/migration-exec.c +++ b/migration-exec.c @@ -16,11 +16,10 @@ */ #include "qemu-common.h" -#include "qemu_socket.h" -#include "migration.h" -#include "qemu-char.h" -#include "buffered_file.h" -#include "block.h" +#include "qemu/sockets.h" +#include "migration/migration.h" +#include "migration/qemu-file.h" +#include "block/block.h" #include <sys/types.h> #include <sys/wait.h> @@ -70,7 +69,6 @@ void exec_start_outgoing_migration(MigrationState *s, const char *command, Error s->fd = fileno(f); assert(s->fd != -1); - socket_set_nonblock(s->fd); s->opaque = qemu_popen(f, "w"); |