[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 02/15] migration: Add postcopy_preempt_active()
From: |
Peter Xu |
Subject: |
[PATCH v2 02/15] migration: Add postcopy_preempt_active() |
Date: |
Tue, 11 Oct 2022 17:55:46 -0400 |
Add the helper to show that postcopy preempt enabled, meanwhile active.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/ram.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index cfeb571800..7aaa843a21 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -162,6 +162,11 @@ out:
return ret;
}
+static bool postcopy_preempt_active(void)
+{
+ return migrate_postcopy_preempt() && migration_in_postcopy();
+}
+
bool ramblock_is_ignored(RAMBlock *block)
{
return !qemu_ram_is_migratable(block) ||
@@ -2433,7 +2438,7 @@ static void postcopy_preempt_choose_channel(RAMState *rs,
PageSearchStatus *pss)
/* We need to make sure rs->f always points to the default channel elsewhere */
static void postcopy_preempt_reset_channel(RAMState *rs)
{
- if (migrate_postcopy_preempt() && migration_in_postcopy()) {
+ if (postcopy_preempt_active()) {
rs->postcopy_channel = RAM_CHANNEL_PRECOPY;
rs->f = migrate_get_current()->to_dst_file;
trace_postcopy_preempt_reset_channel();
@@ -2471,7 +2476,7 @@ static int ram_save_host_page(RAMState *rs,
PageSearchStatus *pss)
return 0;
}
- if (migrate_postcopy_preempt() && migration_in_postcopy()) {
+ if (postcopy_preempt_active()) {
postcopy_preempt_choose_channel(rs, pss);
}
--
2.37.3
- [PATCH v2 00/15] migration: Postcopy Preempt-Full, Peter Xu, 2022/10/11
- [PATCH v2 01/15] migration: Take bitmap mutex when completing ram migration, Peter Xu, 2022/10/11
- [PATCH v2 02/15] migration: Add postcopy_preempt_active(),
Peter Xu <=
- [PATCH v2 03/15] migration: Cleanup xbzrle zero page cache update logic, Peter Xu, 2022/10/11
- [PATCH v2 04/15] migration: Trivial cleanup save_page_header() on same block check, Peter Xu, 2022/10/11
- [PATCH v2 06/15] migration: Yield bitmap_mutex properly when sending/sleeping, Peter Xu, 2022/10/11
- [PATCH v2 10/15] migration: Add pss_init(), Peter Xu, 2022/10/11
- [PATCH v2 05/15] migration: Remove RAMState.f references in compression code, Peter Xu, 2022/10/11
- [PATCH v2 11/15] migration: Make PageSearchStatus part of RAMState, Peter Xu, 2022/10/11