diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-04-02 16:13:59 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-04-02 16:13:59 +0100 |
| commit | 37301a8d0fe2b2a837747548c1ecf7d73b6fe8ab (patch) | |
| tree | 8c34caa21195893c59287a3138d9d58973890e27 /migration/migration.c | |
| parent | 436960c95946007aca713330e7a488a6f2e0696f (diff) | |
| parent | 79b9d4bde7db3f760851217b329c68a883184c6b (diff) | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2019-04-02' into staging
Miscellaneous patches for 2019-04-02
# gpg: Signature made Tue 02 Apr 2019 12:54:27 BST
# gpg: using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-misc-2019-04-02:
accel: Unbreak accelerator fallback
vl: Document dependencies hiding in global and compat props
migration: Support adding migration blockers earlier
Revert "migration: move only_migratable to MigrationState"
Revert "vl: Fix to create migration object before block backends again"
qapi/migration.json: Rename COLOStatus last_mode to last-mode
qapi/migration.json: Fix ColoStatus member last_mode's version
vl: Fix error location of positional arguments
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/migration.c')
| -rw-r--r-- | migration/migration.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/migration/migration.c b/migration/migration.c index 69f75124c9..609e0df5d0 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1646,7 +1646,11 @@ bool migration_in_postcopy_after_devices(MigrationState *s) bool migration_is_idle(void) { - MigrationState *s = migrate_get_current(); + MigrationState *s = current_migration; + + if (!s) { + return true; + } switch (s->state) { case MIGRATION_STATUS_NONE: @@ -1707,7 +1711,7 @@ static GSList *migration_blockers; int migrate_add_blocker(Error *reason, Error **errp) { - if (migrate_get_current()->only_migratable) { + if (only_migratable) { error_propagate_prepend(errp, error_copy(reason), "disallowing migration blocker " "(--only_migratable) for: "); @@ -3337,7 +3341,7 @@ void migration_global_dump(Monitor *mon) monitor_printf(mon, "store-global-state: %s\n", ms->store_global_state ? "on" : "off"); monitor_printf(mon, "only-migratable: %s\n", - ms->only_migratable ? "on" : "off"); + only_migratable ? "on" : "off"); monitor_printf(mon, "send-configuration: %s\n", ms->send_configuration ? "on" : "off"); monitor_printf(mon, "send-section-footer: %s\n", @@ -3352,7 +3356,6 @@ void migration_global_dump(Monitor *mon) static Property migration_properties[] = { DEFINE_PROP_BOOL("store-global-state", MigrationState, store_global_state, true), - DEFINE_PROP_BOOL("only-migratable", MigrationState, only_migratable, false), DEFINE_PROP_BOOL("send-configuration", MigrationState, send_configuration, true), DEFINE_PROP_BOOL("send-section-footer", MigrationState, |