[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/17] migration: Split ram_bytes_total_common() in two functions
From: |
Juan Quintela |
Subject: |
[PULL 08/17] migration: Split ram_bytes_total_common() in two functions |
Date: |
Fri, 10 Feb 2023 00:34:17 +0100 |
It is just a big if in the middle of the function, and we need two
functions anways.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
Reindent to make Phillipe happy (and CODING_STYLE)
---
migration/ram.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 3aea86c8ab..4dd9cf87ea 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2601,28 +2601,30 @@ void acct_update_position(QEMUFile *f, size_t size,
bool zero)
}
}
-static uint64_t ram_bytes_total_common(bool count_ignored)
+static uint64_t ram_bytes_total_with_ignored(void)
{
RAMBlock *block;
uint64_t total = 0;
RCU_READ_LOCK_GUARD();
- if (count_ignored) {
- RAMBLOCK_FOREACH_MIGRATABLE(block) {
- total += block->used_length;
- }
- } else {
- RAMBLOCK_FOREACH_NOT_IGNORED(block) {
- total += block->used_length;
- }
+ RAMBLOCK_FOREACH_MIGRATABLE(block) {
+ total += block->used_length;
}
return total;
}
uint64_t ram_bytes_total(void)
{
- return ram_bytes_total_common(false);
+ RAMBlock *block;
+ uint64_t total = 0;
+
+ RCU_READ_LOCK_GUARD();
+
+ RAMBLOCK_FOREACH_NOT_IGNORED(block) {
+ total += block->used_length;
+ }
+ return total;
}
static void xbzrle_load_setup(void)
@@ -3227,7 +3229,8 @@ static int ram_save_setup(QEMUFile *f, void *opaque)
(*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);
+ qemu_put_be64(f, ram_bytes_total_with_ignored()
+ | RAM_SAVE_FLAG_MEM_SIZE);
RAMBLOCK_FOREACH_MIGRATABLE(block) {
qemu_put_byte(f, strlen(block->idstr));
--
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 <=
- [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, 2023/02/09
- [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