[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/19] migration: Remove RAMState.f references in compression code
From: |
Juan Quintela |
Subject: |
[PULL 09/19] migration: Remove RAMState.f references in compression code |
Date: |
Thu, 15 Dec 2022 10:38:39 +0100 |
From: Peter Xu <peterx@redhat.com>
Removing referencing to RAMState.f in compress_page_with_multi_thread() and
flush_compressed_data().
Compression code by default isn't compatible with having >1 channels (or it
won't currently know which channel to flush the compressed data), so to
make it simple we always flush on the default to_dst_file port until
someone wants to add >1 ports support, as rs->f right now can really
change (after postcopy preempt is introduced).
There should be no functional change at all after patch applied, since as
long as rs->f referenced in compression code, it must be to_dst_file.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/ram.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 41475431fc..6e3dc845c5 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1461,6 +1461,7 @@ static bool save_page_use_compression(RAMState *rs);
static void flush_compressed_data(RAMState *rs)
{
+ MigrationState *ms = migrate_get_current();
int idx, len, thread_count;
if (!save_page_use_compression(rs)) {
@@ -1479,7 +1480,7 @@ static void flush_compressed_data(RAMState *rs)
for (idx = 0; idx < thread_count; idx++) {
qemu_mutex_lock(&comp_param[idx].mutex);
if (!comp_param[idx].quit) {
- len = qemu_put_qemu_file(rs->f, comp_param[idx].file);
+ len = qemu_put_qemu_file(ms->to_dst_file, comp_param[idx].file);
/*
* it's safe to fetch zero_page without holding comp_done_lock
* as there is no further request submitted to the thread,
@@ -1498,11 +1499,11 @@ static inline void set_compress_params(CompressParam
*param, RAMBlock *block,
param->offset = offset;
}
-static int compress_page_with_multi_thread(RAMState *rs, RAMBlock *block,
- ram_addr_t offset)
+static int compress_page_with_multi_thread(RAMBlock *block, ram_addr_t offset)
{
int idx, thread_count, bytes_xmit = -1, pages = -1;
bool wait = migrate_compress_wait_thread();
+ MigrationState *ms = migrate_get_current();
thread_count = migrate_compress_threads();
qemu_mutex_lock(&comp_done_lock);
@@ -1510,7 +1511,8 @@ retry:
for (idx = 0; idx < thread_count; idx++) {
if (comp_param[idx].done) {
comp_param[idx].done = false;
- bytes_xmit = qemu_put_qemu_file(rs->f, comp_param[idx].file);
+ bytes_xmit = qemu_put_qemu_file(ms->to_dst_file,
+ comp_param[idx].file);
qemu_mutex_lock(&comp_param[idx].mutex);
set_compress_params(&comp_param[idx], block, offset);
qemu_cond_signal(&comp_param[idx].cond);
@@ -2263,7 +2265,7 @@ static bool save_compress_page(RAMState *rs, RAMBlock
*block, ram_addr_t offset)
return false;
}
- if (compress_page_with_multi_thread(rs, block, offset) > 0) {
+ if (compress_page_with_multi_thread(block, offset) > 0) {
return true;
}
--
2.38.1
- [PULL 00/19] Next 8.0 patches, Juan Quintela, 2022/12/15
- [PULL 02/19] multifd: Create page_count fields into both MultiFD{Recv, Send}Params, Juan Quintela, 2022/12/15
- [PULL 01/19] multifd: Create page_size fields into both MultiFD{Recv, Send}Params, Juan Quintela, 2022/12/15
- [PULL 04/19] migration: Export ram_release_page(), Juan Quintela, 2022/12/15
- [PULL 03/19] migration: Export ram_transferred_ram(), Juan Quintela, 2022/12/15
- [PULL 05/19] migration: Take bitmap mutex when completing ram migration, Juan Quintela, 2022/12/15
- [PULL 06/19] migration: Add postcopy_preempt_active(), Juan Quintela, 2022/12/15
- [PULL 07/19] migration: Cleanup xbzrle zero page cache update logic, Juan Quintela, 2022/12/15
- [PULL 08/19] migration: Trivial cleanup save_page_header() on same block check, Juan Quintela, 2022/12/15
- [PULL 09/19] migration: Remove RAMState.f references in compression code,
Juan Quintela <=
- [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 13/19] migration: Introduce pss_channel, Juan Quintela, 2022/12/15
- [PULL 14/19] migration: Add pss_init(), 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, 2022/12/15