[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/5] migration: fix ram_state_pending_exact()
From: |
Juan Quintela |
Subject: |
[PULL 5/5] migration: fix ram_state_pending_exact() |
Date: |
Wed, 12 Apr 2023 23:45:07 +0200 |
I removed that bit on commit:
commit c8df4a7aeffcb46020f610526eea621fa5b0cd47
Author: Juan Quintela <quintela@redhat.com>
Date: Mon Oct 3 02:00:03 2022 +0200
migration: Split save_live_pending() into state_pending_*
Fixes: c8df4a7aeffcb46020f610526eea621fa5b0cd47
Suggested-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/ram.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/migration/ram.c b/migration/ram.c
index 9d1817ab7b..79d881f735 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -3506,12 +3506,13 @@ static void ram_state_pending_estimate(void *opaque,
uint64_t *must_precopy,
static void ram_state_pending_exact(void *opaque, uint64_t *must_precopy,
uint64_t *can_postcopy)
{
+ MigrationState *s = migrate_get_current();
RAMState **temp = opaque;
RAMState *rs = *temp;
uint64_t remaining_size = rs->migration_dirty_pages * TARGET_PAGE_SIZE;
- if (!migration_in_postcopy()) {
+ if (!migration_in_postcopy() && remaining_size < s->threshold_size) {
qemu_mutex_lock_iothread();
WITH_RCU_READ_LOCK_GUARD() {
migration_bitmap_sync_precopy(rs);
--
2.39.2
- [PULL 0/5] Migration 20230412 patches, Juan Quintela, 2023/04/12
- [PULL 2/5] migration: Fix potential race on postcopy_qemufile_src, Juan Quintela, 2023/04/12
- [PULL 1/5] io: tls: Inherit QIO_CHANNEL_FEATURE_SHUTDOWN on server side, Juan Quintela, 2023/04/12
- [PULL 5/5] migration: fix ram_state_pending_exact(),
Juan Quintela <=
- [PULL 3/5] migration: Recover behavior of preempt channel creation for pre-7.2, Juan Quintela, 2023/04/12
- [PULL 4/5] migration/ram.c: Fix migration with compress enabled, Juan Quintela, 2023/04/12
- Re: [PULL 0/5] Migration 20230412 patches, Peter Maydell, 2023/04/13