diff options
author | Juan Quintela <quintela@redhat.com> | 2017-04-05 20:45:22 +0200 |
---|---|---|
committer | Juan Quintela <quintela@redhat.com> | 2017-05-18 18:04:54 +0200 |
commit | ce7c817c85e704b2f5dc3a976c7a1c5ce0fd93c2 (patch) | |
tree | d3ccb2d24ff20989a2cb1b8b9699552e17a6f8e5 /migration/savevm.c | |
parent | 2833c59b947cf909020c4d6194aac35f383e832b (diff) |
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 <quintela@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
- Maintain shared/enabled dependency (Xu suggestion)
- Now we maintain the dependency on the setter functions
- improve error messages
Diffstat (limited to 'migration/savevm.c')
-rw-r--r-- | migration/savevm.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/migration/savevm.c b/migration/savevm.c index f5e81948e6..2f1f4eb547 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1233,8 +1233,6 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp) { int ret; MigrationParams params = { - .blk = 0, - .shared = 0 }; MigrationState *ms = migrate_init(¶ms); MigrationStatus status; @@ -1245,6 +1243,12 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp) goto done; } + if (migrate_use_block()) { + error_setg(errp, "Block migration and snapshots are incompatible"); + ret = -EINVAL; + goto done; + } + qemu_mutex_unlock_iothread(); qemu_savevm_state_header(f); qemu_savevm_state_begin(f, ¶ms); |