target/arm: Pass TCGMemOpIdx to sve memory helpers

[qemu.git] / migration / exec.c

diff --git a/migration/exec.c b/migration/exec.c
index 57a93355d1f50b92a691c5e4c8caafda777150be..375d2e1b54c421646e613b56efe6511c5c789e7f 100644 (file)
--- a/migration/exec.c
+++ b/migration/exec.c
@@ -18,10 +18,9 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
-#include "qemu-common.h"
 #include "channel.h"
-#include "migration/migration.h"
+#include "exec.h"
+#include "migration.h"
 #include "io/channel-command.h"
 #include "trace.h"
 
@@ -40,7 +39,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));
 }
 
@@ -48,9 +47,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)
@@ -67,9 +66,8 @@ void exec_start_incoming_migration(const char *command, Error **errp)
     }
 
     qio_channel_set_name(ioc, "migration-exec-incoming");
-    qio_channel_add_watch(ioc,
-                          G_IO_IN,
-                          exec_accept_incoming_migration,
-                          NULL,
-                          NULL);
+    qio_channel_add_watch_full(ioc, G_IO_IN,
+                               exec_accept_incoming_migration,
+                               NULL, NULL,
+                               g_main_context_get_thread_default());
 }