aboutsummaryrefslogtreecommitdiff
path: root/migration
diff options
context:
space:
mode:
authorPeter Xu <peterx@redhat.com>2021-09-22 12:20:08 -0400
committerJuan Quintela <quintela@redhat.com>2021-11-01 22:56:44 +0100
commit60fd680193119e7e4d50eccff7b55a0aadc934ab (patch)
tree8cdcfe2d4ca474a7c5c4a499c04357b883043a86 /migration
parent4c170330aae4a4ed75c3a8638b7d4c5d9f365244 (diff)
downloadqemu-60fd680193119e7e4d50eccff7b55a0aadc934ab.zip
qemu-60fd680193119e7e4d50eccff7b55a0aadc934ab.tar.gz
qemu-60fd680193119e7e4d50eccff7b55a0aadc934ab.tar.bz2
migration: Add migrate_add_blocker_internal()
An internal version that removes -only-migratable implications. It can be used for temporary migration blockers like dump-guest-memory. Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Peter Xu <peterx@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'migration')
-rw-r--r--migration/migration.c21
1 files changed, 13 insertions, 8 deletions
diff --git a/migration/migration.c b/migration/migration.c
index e81e473..e1c0082 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2049,15 +2049,8 @@ void migrate_init(MigrationState *s)
s->threshold_size = 0;
}
-int migrate_add_blocker(Error *reason, Error **errp)
+int migrate_add_blocker_internal(Error *reason, Error **errp)
{
- if (only_migratable) {
- error_propagate_prepend(errp, error_copy(reason),
- "disallowing migration blocker "
- "(--only-migratable) for: ");
- return -EACCES;
- }
-
/* 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),
@@ -2070,6 +2063,18 @@ int migrate_add_blocker(Error *reason, Error **errp)
return 0;
}
+int migrate_add_blocker(Error *reason, Error **errp)
+{
+ if (only_migratable) {
+ error_propagate_prepend(errp, error_copy(reason),
+ "disallowing migration blocker "
+ "(--only-migratable) for: ");
+ return -EACCES;
+ }
+
+ return migrate_add_blocker_internal(reason, errp);
+}
+
void migrate_del_blocker(Error *reason)
{
migration_blockers = g_slist_remove(migration_blockers, reason);