multiboot: Use signed type for negative error numbers

[qemu.git] / migration.h

diff --git a/migration.h b/migration.h
index 40bd610a3244393f1a0a894a28debb454fcb6ca3..3f2b3df2bd5ac190793b11ed057fef06596ad617 100644 (file)
--- a/migration.h
+++ b/migration.h
@@ -30,6 +30,8 @@ struct MigrationState
     void (*cancel)(MigrationState *s);
     int (*get_status)(MigrationState *s);
     void (*release)(MigrationState *s);
+    int blk;
+    int shared;
 };
 
 typedef struct FdMigrationState FdMigrationState;
@@ -40,7 +42,7 @@ struct FdMigrationState
     int64_t bandwidth_limit;
     QEMUFile *file;
     int fd;
-    Monitor *mon_resume;
+    Monitor *mon;
     int state;
     int (*get_error)(struct FdMigrationState*);
     int (*close)(struct FdMigrationState*);
@@ -52,7 +54,7 @@ void qemu_start_incoming_migration(const char *uri);
 
 void do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data);
 
-void do_migrate_cancel(Monitor *mon, const QDict *qdict);
+void do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data);
 
 void do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data);
 
@@ -64,30 +66,41 @@ void do_info_migrate(Monitor *mon);
 
 int exec_start_incoming_migration(const char *host_port);
 
-MigrationState *exec_start_outgoing_migration(const char *host_port,
-                                            int64_t bandwidth_limit,
-                                            int detach);
+MigrationState *exec_start_outgoing_migration(Monitor *mon,
+                                              const char *host_port,
+                                             int64_t bandwidth_limit,
+                                             int detach,
+                                             int blk,
+                                             int inc);
 
 int tcp_start_incoming_migration(const char *host_port);
 
-MigrationState *tcp_start_outgoing_migration(const char *host_port,
+MigrationState *tcp_start_outgoing_migration(Monitor *mon,
+                                             const char *host_port,
                                             int64_t bandwidth_limit,
-                                            int detach);
+                                            int detach,
+                                            int blk,
+                                            int inc);
 
 int unix_start_incoming_migration(const char *path);
 
-MigrationState *unix_start_outgoing_migration(const char *path,
+MigrationState *unix_start_outgoing_migration(Monitor *mon,
+                                              const char *path,
                                              int64_t bandwidth_limit,
-                                             int detach);
+                                             int detach,
+                                             int blk,
+                                             int inc);
 
 int fd_start_incoming_migration(const char *path);
 
 MigrationState *fd_start_outgoing_migration(Monitor *mon,
                                            const char *fdname,
                                            int64_t bandwidth_limit,
-                                           int detach);
+                                           int detach,
+                                           int blk,
+                                           int inc);
 
-void migrate_fd_monitor_suspend(FdMigrationState *s);
+void migrate_fd_monitor_suspend(FdMigrationState *s, Monitor *mon);
 
 void migrate_fd_error(FdMigrationState *s);