From ce7c817c85e704b2f5dc3a976c7a1c5ce0fd93c2 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Wed, 5 Apr 2017 20:45:22 +0200 Subject: migration: Remove use of old MigrationParams We have change in the previous patch to use migration capabilities for it. Notice that we continue using the old command line flags from migrate command from the time being. Remove the set_params method as now it is empty. For savevm, one can't do a: savevm -b/-i foo but now one can do: migrate_set_capability block on savevm foo And we can't use block migration. We could disable block capability unconditionally, but it would not be much better. Signed-off-by: Juan Quintela Reviewed-by: Eric Blake --- - Maintain shared/enabled dependency (Xu suggestion) - Now we maintain the dependency on the setter functions - improve error messages --- migration/colo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'migration/colo.c') diff --git a/migration/colo.c b/migration/colo.c index 963c80256d..8c86892246 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -14,6 +14,7 @@ #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "migration/colo.h" +#include "migration/block.h" #include "io/channel-buffer.h" #include "trace.h" #include "qemu/error-report.h" @@ -345,8 +346,7 @@ static int colo_do_checkpoint_transaction(MigrationState *s, } /* Disable block migration */ - s->params.blk = 0; - s->params.shared = 0; + migrate_set_block_enabled(false, &local_err); qemu_savevm_state_header(fb); qemu_savevm_state_begin(fb, &s->params); qemu_mutex_lock_iothread(); -- cgit v1.2.1