Include qapi/qmp/qdict.h exactly where needed

[qemu.git] / migration / exec.c

diff --git a/migration/exec.c b/migration/exec.c
index 9077024286c29fc03abf86596198354135c04f00..0bc5a427dd6b4913ef8e1e44f07dc002e8d6858a 100644 (file)
--- a/migration/exec.c
+++ b/migration/exec.c
@@ -18,11 +18,8 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
-#include "qemu-common.h"
 #include "channel.h"
 #include "exec.h"
-#include "migration/migration.h"
 #include "io/channel-command.h"
 #include "trace.h"
 
@@ -41,7 +38,7 @@ void exec_start_outgoing_migration(MigrationState *s, const char *command, Error
     }
 
     qio_channel_set_name(ioc, "migration-exec-outgoing");
-    migration_channel_connect(s, ioc, NULL);
+    migration_channel_connect(s, ioc, NULL, NULL);
     object_unref(OBJECT(ioc));
 }
 
@@ -49,9 +46,9 @@ static gboolean exec_accept_incoming_migration(QIOChannel *ioc,
                                                GIOCondition condition,
                                                gpointer opaque)
 {
-    migration_channel_process_incoming(migrate_get_current(), ioc);
+    migration_channel_process_incoming(ioc);
     object_unref(OBJECT(ioc));
-    return FALSE; /* unregister */
+    return G_SOURCE_REMOVE;
 }
 
 void exec_start_incoming_migration(const char *command, Error **errp)