[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 06/11] migration: Move busy++ to migrate_with_multithread
From: |
Juan Quintela |
Subject: |
[PATCH v2 06/11] migration: Move busy++ to migrate_with_multithread |
Date: |
Thu, 19 Oct 2023 13:07:19 +0200 |
And now we can simplify save_compress_page().
Reviewed-by: Lukas Straub <lukasstraub2@web.de>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/ram-compress.c | 1 +
migration/ram.c | 8 ++------
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/migration/ram-compress.c b/migration/ram-compress.c
index a991b15b7a..f56e1f8e69 100644
--- a/migration/ram-compress.c
+++ b/migration/ram-compress.c
@@ -291,6 +291,7 @@ bool compress_page_with_multi_thread(RAMBlock *block,
ram_addr_t offset,
}
if (!wait) {
qemu_mutex_unlock(&comp_done_lock);
+ compression_counters.busy++;
return false;
}
/*
diff --git a/migration/ram.c b/migration/ram.c
index de7878c46e..a3c5fcc549 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2067,12 +2067,8 @@ static bool save_compress_page(RAMState *rs,
PageSearchStatus *pss,
return false;
}
- if (compress_page_with_multi_thread(pss->block, offset, send_queued_data))
{
- return true;
- }
-
- compression_counters.busy++;
- return false;
+ return compress_page_with_multi_thread(pss->block, offset,
+ send_queued_data);
}
/**
--
2.41.0
- [PATCH v2 00/11] Migration compression cleanup, Juan Quintela, 2023/10/19
- [PATCH v2 01/11] migration: Give one error if trying to set MULTIFD and XBZRLE, Juan Quintela, 2023/10/19
- [PATCH v2 03/11] migration: Remove save_page_use_compression(), Juan Quintela, 2023/10/19
- [PATCH v2 05/11] migration: Simplify compress_page_with_multithread(), Juan Quintela, 2023/10/19
- [PATCH v2 02/11] migration: Give one error if trying to set COMPRESSION and XBZRLE, Juan Quintela, 2023/10/19
- [PATCH v2 06/11] migration: Move busy++ to migrate_with_multithread,
Juan Quintela <=
- [PATCH v2 11/11] migration: Rename ram_compressed_pages() to compress_ram_pages(), Juan Quintela, 2023/10/19
- [PATCH v2 08/11] migration: Export send_queued_data(), Juan Quintela, 2023/10/19
- [PATCH v2 07/11] migration: Create compress_update_rates(), Juan Quintela, 2023/10/19
- [PATCH v2 10/11] migration: Merge flush_compressed_data() and compress_flush_data(), Juan Quintela, 2023/10/19