aboutsummaryrefslogtreecommitdiffstats
path: root/migration-exec.c
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2009-11-30 18:21:21 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-12-03 10:48:53 -0600
commitf327aa0c608b4bae3c93f0fbd0afcfdd9c9635bc (patch)
treec8a24861d58587a3b2107cb22fda348b2d746e00 /migration-exec.c
parent82801d8f4f3fa7413647495d9823fb3144c31ddc (diff)
live migration: Propagate output monitor to callback handler
In order to allow proper progress reporting to the monitor that initiated the migration, forward the monitor reference through the migration layer down to SaveLiveStateHandler. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'migration-exec.c')
-rw-r--r--migration-exec.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/migration-exec.c b/migration-exec.c
index c83066959..87f645b68 100644
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -52,7 +52,8 @@ static int exec_close(FdMigrationState *s)
return 0;
}
-MigrationState *exec_start_outgoing_migration(const char *command,
+MigrationState *exec_start_outgoing_migration(Monitor *mon,
+ const char *command,
int64_t bandwidth_limit,
int detach,
int blk,
@@ -88,13 +89,14 @@ MigrationState *exec_start_outgoing_migration(const char *command,
s->mig_state.blk = blk;
s->mig_state.shared = inc;
-
+
s->state = MIG_STATE_ACTIVE;
- s->mon_resume = NULL;
+ s->mon = NULL;
s->bandwidth_limit = bandwidth_limit;
- if (!detach)
- migrate_fd_monitor_suspend(s);
+ if (!detach) {
+ migrate_fd_monitor_suspend(s, mon);
+ }
migrate_fd_connect(s);
return &s->mig_state;