[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/17] migration: Simplify ram_find_and_save_block()
From: |
Juan Quintela |
Subject: |
[PULL 06/17] migration: Simplify ram_find_and_save_block() |
Date: |
Fri, 10 Feb 2023 00:34:15 +0100 |
We will need later that find_dirty_block() return errors, so
simplify the loop.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/ram.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index b966e148c2..dd809fec1f 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2542,7 +2542,6 @@ static int ram_find_and_save_block(RAMState *rs)
{
PageSearchStatus *pss = &rs->pss[RAM_CHANNEL_PRECOPY];
int pages = 0;
- bool again, found;
/* No dirty page as there is zero RAM */
if (!ram_bytes_total()) {
@@ -2564,18 +2563,17 @@ static int ram_find_and_save_block(RAMState *rs)
pss_init(pss, rs->last_seen_block, rs->last_page);
do {
- again = true;
- found = get_queued_page(rs, pss);
-
- if (!found) {
+ if (!get_queued_page(rs, pss)) {
/* priority queue empty, so just search for something dirty */
- found = find_dirty_block(rs, pss, &again);
+ bool again = true;
+ if (!find_dirty_block(rs, pss, &again)) {
+ if (!again) {
+ break;
+ }
+ }
}
-
- if (found) {
- pages = ram_save_host_page(rs, pss);
- }
- } while (!pages && again);
+ pages = ram_save_host_page(rs, pss);
+ } while (!pages);
rs->last_seen_block = pss->block;
rs->last_page = pss->page;
--
2.39.1
- [PULL 00/17] Migration 20230209 patches, Juan Quintela, 2023/02/09
- [PULL 02/17] multifd: cleanup the function multifd_channel_connect, Juan Quintela, 2023/02/09
- [PULL 01/17] migration: Remove spurious files, Juan Quintela, 2023/02/09
- [PULL 03/17] multifd: Remove some redundant code, Juan Quintela, 2023/02/09
- [PULL 04/17] linux-headers: Update to v6.1, Juan Quintela, 2023/02/09
- [PULL 05/17] util/userfaultfd: Support /dev/userfaultfd, Juan Quintela, 2023/02/09
- [PULL 08/17] migration: Split ram_bytes_total_common() in two functions, Juan Quintela, 2023/02/09
- [PULL 07/17] migration: Make find_dirty_block() return a single parameter, Juan Quintela, 2023/02/09
- [PULL 06/17] migration: Simplify ram_find_and_save_block(),
Juan Quintela <=
- [PULL 10/17] migration: Make ram_save_target_page() a pointer, Juan Quintela, 2023/02/09
- [PULL 09/17] migration: Calculate ram size once, Juan Quintela, 2023/02/09
- [PULL 11/17] migration: I messed state_pending_exact/estimate, Juan Quintela, 2023/02/09
- [PULL 12/17] AVX512 support for xbzrle_encode_buffer, Juan Quintela, 2023/02/09
- [PULL 13/17] Update bench-code for addressing CI problem, Juan Quintela, 2023/02/09
- [PULL 14/17] migration: Rework multi-channel checks on URI, Juan Quintela, 2023/02/09
- [PULL 15/17] migration: Cleanup postcopy_preempt_setup(), Juan Quintela, 2023/02/09
- [PULL 16/17] migration: Add a semaphore to count PONGs, Juan Quintela, 2023/02/09
- [PULL 17/17] migration: Postpone postcopy preempt channel to be after main, Juan Quintela, 2023/02/09