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 e4b40579a16d719dfafd62e23c25e395fa57e2ad..67a461c28a4ec46819c773ef320fff3e21eeab09 100644 (file)
--- a/migration/channel.h
+++ b/migration/channel.h
@@ -22,5 +22,6 @@ 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