[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/20] migration: Add migrate_add_blocker_internal()
From: |
Juan Quintela |
Subject: |
[PULL 09/20] migration: Add migrate_add_blocker_internal() |
Date: |
Mon, 1 Nov 2021 23:09:01 +0100 |
From: Peter Xu <peterx@redhat.com>
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>
---
include/migration/blocker.h | 16 ++++++++++++++++
migration/migration.c | 21 +++++++++++++--------
2 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/include/migration/blocker.h b/include/migration/blocker.h
index acd27018e9..9cebe2ba06 100644
--- a/include/migration/blocker.h
+++ b/include/migration/blocker.h
@@ -25,6 +25,22 @@
*/
int migrate_add_blocker(Error *reason, Error **errp);
+/**
+ * @migrate_add_blocker_internal - prevent migration from proceeding without
+ * only-migrate implications
+ *
+ * @reason - an error to be returned whenever migration is attempted
+ *
+ * @errp - [out] The reason (if any) we cannot block migration right now.
+ *
+ * @returns - 0 on success, -EBUSY on failure, with errp set.
+ *
+ * Some of the migration blockers can be temporary (e.g., for a few seconds),
+ * so it shouldn't need to conflict with "-only-migratable". For those cases,
+ * we can call this function rather than @migrate_add_blocker().
+ */
+int migrate_add_blocker_internal(Error *reason, Error **errp);
+
/**
* @migrate_del_blocker - remove a blocking error from migration
*
diff --git a/migration/migration.c b/migration/migration.c
index e81e473f5a..e1c0082530 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);
--
2.33.1
- [PULL 00/20] Migration 20211031 patches, Juan Quintela, 2021/11/01
- [PULL 02/20] KVM: introduce dirty_pages and kvm_dirty_ring_enabled, Juan Quintela, 2021/11/01
- [PULL 01/20] migration/rdma: Fix out of order wrid, Juan Quintela, 2021/11/01
- [PULL 04/20] migration/dirtyrate: introduce struct and adjust DirtyRateStat, Juan Quintela, 2021/11/01
- [PULL 05/20] migration/dirtyrate: adjust order of registering thread, Juan Quintela, 2021/11/01
- [PULL 03/20] memory: make global_dirty_tracking a bitmask, Juan Quintela, 2021/11/01
- [PULL 06/20] migration/dirtyrate: move init step of calculation to main thread, Juan Quintela, 2021/11/01
- [PULL 08/20] migration: Make migration blocker work for snapshots too, Juan Quintela, 2021/11/01
- [PULL 09/20] migration: Add migrate_add_blocker_internal(),
Juan Quintela <=
- [PULL 10/20] dump-guest-memory: Block live migration, Juan Quintela, 2021/11/01
- [PULL 11/20] memory: Introduce replay_discarded callback for RamDiscardManager, Juan Quintela, 2021/11/01
- [PULL 12/20] virtio-mem: Implement replay_discarded RamDiscardManager callback, Juan Quintela, 2021/11/01
- [PULL 13/20] migration/ram: Handle RAMBlocks with a RamDiscardManager on the migration source, Juan Quintela, 2021/11/01
- [PULL 14/20] virtio-mem: Drop precopy notifier, Juan Quintela, 2021/11/01
- [PULL 18/20] migration/ram: Handle RAMBlocks with a RamDiscardManager on background snapshots, Juan Quintela, 2021/11/01
- [PULL 07/20] migration/dirtyrate: implement dirty-ring dirtyrate calculation, Juan Quintela, 2021/11/01
- [PULL 19/20] memory: introduce total_dirty_pages to stat dirty pages, Juan Quintela, 2021/11/01