hw/arm/virt-acpi-build: use PCIE_MMCFG_BUS to retrieve end_bus_number

[mirror_qemu.git] / migration / fd.c

diff --git a/migration/fd.c b/migration/fd.c
index 6284a97cba37099447d754d04e1eb4b7157e06a6..a7c13df4ad3e7ad685ddb3ec01b6373d5003d192 100644 (file)
--- a/migration/fd.c
+++ b/migration/fd.c
@@ -15,9 +15,9 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include "channel.h"
 #include "fd.h"
+#include "migration.h"
 #include "monitor/monitor.h"
 #include "io/channel-util.h"
 #include "trace.h"
@@ -67,9 +67,8 @@ void fd_start_incoming_migration(const char *infd, Error **errp)
     }
 
     qio_channel_set_name(QIO_CHANNEL(ioc), "migration-fd-incoming");
-    qio_channel_add_watch(ioc,
-                          G_IO_IN,
-                          fd_accept_incoming_migration,
-                          NULL,
-                          NULL);
+    qio_channel_add_watch_full(ioc, G_IO_IN,
+                               fd_accept_incoming_migration,
+                               NULL, NULL,
+                               g_main_context_get_thread_default());
 }