diff options
| author | Peter Xu <peterx@redhat.com> | 2021-09-22 12:20:07 -0400 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2021-11-01 22:56:43 +0100 |
| commit | 4c170330aae4a4ed75c3a8638b7d4c5d9f365244 (patch) | |
| tree | fdd88259b76fa72d61e1197f5c8fc577f9d030e1 | |
| parent | 0e21bf24608b801bcdf6057f47808613061ecbe3 (diff) | |
| download | focaccia-qemu-4c170330aae4a4ed75c3a8638b7d4c5d9f365244.tar.gz focaccia-qemu-4c170330aae4a4ed75c3a8638b7d4c5d9f365244.zip | |
migration: Make migration blocker work for snapshots too
save_snapshot() checks migration blocker, which looks sane. At the meantime we should also teach the blocker add helper to fail if during a snapshot, just like for migrations. Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Peter Xu <peterx@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
| -rw-r--r-- | migration/migration.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/migration/migration.c b/migration/migration.c index 9172686b89..e81e473f5a 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2058,15 +2058,16 @@ int migrate_add_blocker(Error *reason, Error **errp) return -EACCES; } - if (migration_is_idle()) { - migration_blockers = g_slist_prepend(migration_blockers, reason); - return 0; + /* Snapshots are similar to migrations, so check RUN_STATE_SAVE_VM too. */ + if (runstate_check(RUN_STATE_SAVE_VM) || !migration_is_idle()) { + error_propagate_prepend(errp, error_copy(reason), + "disallowing migration blocker " + "(migration/snapshot in progress) for: "); + return -EBUSY; } - error_propagate_prepend(errp, error_copy(reason), - "disallowing migration blocker " - "(migration in progress) for: "); - return -EBUSY; + migration_blockers = g_slist_prepend(migration_blockers, reason); + return 0; } void migrate_del_blocker(Error *reason) |