diff options
| author | Hyman Huang(黄勇) <yong.huang@smartx.com> | 2023-06-07 23:32:51 +0800 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2023-07-26 10:55:56 +0200 |
| commit | bb9993c6725ac13098058f873efb06880ce46c32 (patch) | |
| tree | e7c64d808bd89bcbb279037324f8094a4bf4fc85 | |
| parent | dc62395557b29312a9c2f9a1e0beece2557c3078 (diff) | |
migration: Refactor auto-converge capability logic
Check if block migration is running before throttling
guest down in auto-converge way.
Note that this modification is kind of like code clean,
because block migration does not depend on auto-converge
capability, so the order of checks can be adjusted.
Signed-off-by: Hyman Huang(黄勇) <yong.huang@smartx.com>
Acked-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <168618975839.6361.17407633874747688653-5@git.sr.ht>
Signed-off-by: Juan Quintela <quintela@redhat.com>
| -rw-r--r-- | migration/ram.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/migration/ram.c b/migration/ram.c index 0ada6477e8..f31de47a47 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -995,7 +995,11 @@ static void migration_trigger_throttle(RAMState *rs) /* During block migration the auto-converge logic incorrectly detects * that ram migration makes no progress. Avoid this by disabling the * throttling logic during the bulk phase of block migration. */ - if (migrate_auto_converge() && !blk_mig_bulk_active()) { + if (blk_mig_bulk_active()) { + return; + } + + if (migrate_auto_converge()) { /* The following detection logic can be refined later. For now: Check to see if the ratio between dirtied bytes and the approx. amount of bytes that just got transferred since the last time |