[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/19] migration: Drop rs->f
From: |
Juan Quintela |
Subject: |
[PULL 19/19] migration: Drop rs->f |
Date: |
Thu, 15 Dec 2022 10:38:49 +0100 |
From: Peter Xu <peterx@redhat.com>
Now with rs->pss we can already cache channels in pss->pss_channels. That
pss_channel contains more infromation than rs->f because it's per-channel.
So rs->f could be replaced by rss->pss[RAM_CHANNEL_PRECOPY].pss_channel,
while rs->f itself is a bit vague now.
Note that vanilla postcopy still send pages via pss[RAM_CHANNEL_PRECOPY],
that's slightly confusing but it reflects the reality.
Then, after the replacement we can safely drop rs->f.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/ram.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 1ae093fb61..334309f1c6 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -323,8 +323,6 @@ struct RAMSrcPageRequest {
/* State of RAM for migration */
struct RAMState {
- /* QEMUFile used for this migration */
- QEMUFile *f;
/*
* PageSearchStatus structures for the channels when send pages.
* Protected by the bitmap_mutex.
@@ -2532,8 +2530,6 @@ static int ram_find_and_save_block(RAMState *rs)
}
if (found) {
- /* Cache rs->f in pss_channel (TODO: remove rs->f) */
- pss->pss_channel = rs->f;
pages = ram_save_host_page(rs, pss);
}
} while (!pages && again);
@@ -3089,7 +3085,7 @@ static void ram_state_resume_prepare(RAMState *rs,
QEMUFile *out)
ram_state_reset(rs);
/* Update RAMState cache of output QEMUFile */
- rs->f = out;
+ rs->pss[RAM_CHANNEL_PRECOPY].pss_channel = out;
trace_ram_state_resume_prepare(pages);
}
@@ -3180,7 +3176,7 @@ static int ram_save_setup(QEMUFile *f, void *opaque)
return -1;
}
}
- (*rsp)->f = f;
+ (*rsp)->pss[RAM_CHANNEL_PRECOPY].pss_channel = f;
WITH_RCU_READ_LOCK_GUARD() {
qemu_put_be64(f, ram_bytes_total_common(true) |
RAM_SAVE_FLAG_MEM_SIZE);
@@ -3315,7 +3311,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
out:
if (ret >= 0
&& migration_is_setup_or_active(migrate_get_current()->state)) {
- ret = multifd_send_sync_main(rs->f);
+ ret = multifd_send_sync_main(rs->pss[RAM_CHANNEL_PRECOPY].pss_channel);
if (ret < 0) {
return ret;
}
@@ -3385,7 +3381,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
return ret;
}
- ret = multifd_send_sync_main(rs->f);
+ ret = multifd_send_sync_main(rs->pss[RAM_CHANNEL_PRECOPY].pss_channel);
if (ret < 0) {
return ret;
}
--
2.38.1
- [PULL 09/19] migration: Remove RAMState.f references in compression code, (continued)
- [PULL 09/19] migration: Remove RAMState.f references in compression code, Juan Quintela, 2022/12/15
- [PULL 11/19] migration: Use atomic ops properly for page accountings, Juan Quintela, 2022/12/15
- [PULL 12/19] migration: Teach PSS about host page, Juan Quintela, 2022/12/15
- [PULL 10/19] migration: Yield bitmap_mutex properly when sending/sleeping, Juan Quintela, 2022/12/15
- [PULL 14/19] migration: Add pss_init(), Juan Quintela, 2022/12/15
- [PULL 13/19] migration: Introduce pss_channel, Juan Quintela, 2022/12/15
- [PULL 15/19] migration: Make PageSearchStatus part of RAMState, Juan Quintela, 2022/12/15
- [PULL 16/19] migration: Move last_sent_block into PageSearchStatus, Juan Quintela, 2022/12/15
- [PULL 17/19] migration: Send requested page directly in rp-return thread, Juan Quintela, 2022/12/15
- [PULL 18/19] migration: Remove old preempt code around state maintainance, Juan Quintela, 2022/12/15
- [PULL 19/19] migration: Drop rs->f,
Juan Quintela <=
- Re: [PULL 00/19] Next 8.0 patches, Peter Maydell, 2022/12/15