diff options
| author | Luiz Capitulino <lcapitulino@redhat.com> | 2011-12-05 14:06:56 -0200 |
|---|---|---|
| committer | Luiz Capitulino <lcapitulino@redhat.com> | 2012-03-15 10:39:52 -0300 |
| commit | 539de1246d355d3b8aa33fb7cde732352d8827c7 (patch) | |
| tree | 63947554dfaa8d5998e484448f9312d73852d531 /migration.c | |
| parent | 79020cfcbb78a85768174bb93ee3b7cfc6ffa353 (diff) | |
| download | qemu-539de1246d355d3b8aa33fb7cde732352d8827c7.tar.gz | |
Purge migration of (almost) everything to do with monitors
The Monitor object is passed back and forth within the migration/savevm
code so that it can print errors and progress to the user.
However, that approach assumes a HMP monitor, being completely invalid
in QMP.
This commit drops almost every single usage of the Monitor object, all
monitor_printf() calls have been converted into DPRINTF() ones.
There are a few remaining Monitor objects, those are going to be dropped
by the next commit.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Diffstat (limited to 'migration.c')
| -rw-r--r-- | migration.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/migration.c b/migration.c index 00fa1e3f72..b21b2df504 100644 --- a/migration.c +++ b/migration.c @@ -258,7 +258,7 @@ static void migrate_fd_put_ready(void *opaque) } DPRINTF("iterate\n"); - ret = qemu_savevm_state_iterate(s->mon, s->file); + ret = qemu_savevm_state_iterate(s->file); if (ret < 0) { migrate_fd_error(s); } else if (ret == 1) { @@ -267,7 +267,7 @@ static void migrate_fd_put_ready(void *opaque) DPRINTF("done iterating\n"); vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); - if (qemu_savevm_state_complete(s->mon, s->file) < 0) { + if (qemu_savevm_state_complete(s->file) < 0) { migrate_fd_error(s); } else { migrate_fd_completed(s); @@ -289,7 +289,7 @@ static void migrate_fd_cancel(MigrationState *s) s->state = MIG_STATE_CANCELLED; notifier_list_notify(&migration_state_notifiers, s); - qemu_savevm_state_cancel(s->mon, s->file); + qemu_savevm_state_cancel(s->file); migrate_fd_cleanup(s); } @@ -367,7 +367,7 @@ void migrate_fd_connect(MigrationState *s) migrate_fd_close); DPRINTF("beginning savevm\n"); - ret = qemu_savevm_state_begin(s->mon, s->file, s->blk, s->shared); + ret = qemu_savevm_state_begin(s->file, s->blk, s->shared); if (ret < 0) { DPRINTF("failed, %d\n", ret); migrate_fd_error(s); |