diff options
author | Jan Kiszka <jan.kiszka@siemens.com> | 2009-11-30 18:21:21 +0100 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-03 10:48:53 -0600 |
commit | f327aa0c608b4bae3c93f0fbd0afcfdd9c9635bc (patch) | |
tree | c8a24861d58587a3b2107cb22fda348b2d746e00 /migration-unix.c | |
parent | 82801d8f4f3fa7413647495d9823fb3144c31ddc (diff) | |
download | hqemu-f327aa0c608b4bae3c93f0fbd0afcfdd9c9635bc.zip hqemu-f327aa0c608b4bae3c93f0fbd0afcfdd9c9635bc.tar.gz |
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-unix.c')
-rw-r--r-- | migration-unix.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/migration-unix.c b/migration-unix.c index 25cd6d3..7dd787c 100644 --- a/migration-unix.c +++ b/migration-unix.c @@ -75,7 +75,8 @@ static void unix_wait_for_connect(void *opaque) } } -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 blk, @@ -101,7 +102,7 @@ MigrationState *unix_start_outgoing_migration(const char *path, s->mig_state.shared = inc; s->state = MIG_STATE_ACTIVE; - s->mon_resume = NULL; + s->mon = NULL; s->bandwidth_limit = bandwidth_limit; s->fd = socket(PF_UNIX, SOCK_STREAM, 0); if (s->fd < 0) { @@ -111,8 +112,9 @@ MigrationState *unix_start_outgoing_migration(const char *path, socket_set_nonblock(s->fd); - if (!detach) - migrate_fd_monitor_suspend(s); + if (!detach) { + migrate_fd_monitor_suspend(s, mon); + } do { ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr)); |