diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-12-23 00:39:34 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-12-23 00:40:49 +0100 |
| commit | 501a7ce7270955be151c442c27620fa7af2f3ce5 (patch) | |
| tree | 0374e4d581a0246074d55712b81baf01f3c439b6 /migration-exec.c | |
| parent | 62e0c095450f6a7eb37914991f3f7966aa4da7a1 (diff) | |
| parent | 36f25d2537c40c6c47f4abee5d31a24863d1adf7 (diff) | |
Merge branch 'master' of git://git.qemu.org/qemu into qom-cpu
Adapt header include paths.
Signed-off-by: Andreas Färber <afaerber@suse.de>
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 2b6fcb4262..a051a6e668 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"); |