Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-3.1-pull-request' into...

[qemu.git] / migration / channel.h

diff --git a/migration/channel.h b/migration/channel.h
index 2e0a7e33cca38f7d65a931d7c4b062159b9154b9..67a461c28a4ec46819c773ef320fff3e21eeab09 100644 (file)
--- a/migration/channel.h
+++ b/migration/channel.h
@@ -18,10 +18,10 @@
 
 #include "io/channel.h"
 
-void migration_channel_process_incoming(MigrationState *s,
-                                        QIOChannel *ioc);
+void migration_channel_process_incoming(QIOChannel *ioc);
 
 void migration_channel_connect(MigrationState *s,
                                QIOChannel *ioc,
-                               const char *hostname);
+                               const char *hostname,
+                               Error *error_in);
 #endif