[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/20] migration: Rename normal to normal_pages
From: |
Juan Quintela |
Subject: |
[PULL 14/20] migration: Rename normal to normal_pages |
Date: |
Thu, 20 Apr 2023 15:17:45 +0200 |
Rest of counters that refer to pages has a _pages suffix.
And historically, this showed the number of full pages transferred.
The name "normal" refered to the fact that they were sent without any
optimization (compression, xbzrle, zero_page, ...).
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
---
migration/migration.c | 2 +-
migration/ram.c | 10 +++++-----
migration/ram.h | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 20ef5b683b..f311bb5f93 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1145,7 +1145,7 @@ static void populate_ram_info(MigrationInfo *info,
MigrationState *s)
info->ram->duplicate = stat64_get(&ram_counters.zero_pages);
/* legacy value. It is not used anymore */
info->ram->skipped = 0;
- info->ram->normal = stat64_get(&ram_counters.normal);
+ info->ram->normal = stat64_get(&ram_counters.normal_pages);
info->ram->normal_bytes = info->ram->normal * page_size;
info->ram->mbps = s->mbps;
info->ram->dirty_sync_count =
diff --git a/migration/ram.c b/migration/ram.c
index 1a098a9c21..7ad92f8756 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1118,7 +1118,7 @@ uint64_t ram_pagesize_summary(void)
uint64_t ram_get_total_transferred_pages(void)
{
- return stat64_get(&ram_counters.normal) +
+ return stat64_get(&ram_counters.normal_pages) +
stat64_get(&ram_counters.zero_pages) +
compression_counters.pages + xbzrle_counters.pages;
}
@@ -1359,7 +1359,7 @@ static bool control_save_page(PageSearchStatus *pss,
RAMBlock *block,
}
if (bytes_xmit > 0) {
- stat64_add(&ram_counters.normal, 1);
+ stat64_add(&ram_counters.normal_pages, 1);
} else if (bytes_xmit == 0) {
stat64_add(&ram_counters.zero_pages, 1);
}
@@ -1393,7 +1393,7 @@ static int save_normal_page(PageSearchStatus *pss,
RAMBlock *block,
qemu_put_buffer(file, buf, TARGET_PAGE_SIZE);
}
ram_transferred_add(TARGET_PAGE_SIZE);
- stat64_add(&ram_counters.normal, 1);
+ stat64_add(&ram_counters.normal_pages, 1);
return 1;
}
@@ -1449,7 +1449,7 @@ static int ram_save_multifd_page(QEMUFile *file, RAMBlock
*block,
if (multifd_queue_page(file, block, offset) < 0) {
return -1;
}
- stat64_add(&ram_counters.normal, 1);
+ stat64_add(&ram_counters.normal_pages, 1);
return 1;
}
@@ -2625,7 +2625,7 @@ void acct_update_position(QEMUFile *f, size_t size, bool
zero)
if (zero) {
stat64_add(&ram_counters.zero_pages, pages);
} else {
- stat64_add(&ram_counters.normal, pages);
+ stat64_add(&ram_counters.normal_pages, pages);
ram_transferred_add(size);
qemu_file_credit_transfer(f, size);
}
diff --git a/migration/ram.h b/migration/ram.h
index b27ce01f2e..11a0fde99b 100644
--- a/migration/ram.h
+++ b/migration/ram.h
@@ -48,7 +48,7 @@ typedef struct {
Stat64 downtime_bytes;
Stat64 zero_pages;
Stat64 multifd_bytes;
- Stat64 normal;
+ Stat64 normal_pages;
Stat64 postcopy_bytes;
Stat64 postcopy_requests;
Stat64 precopy_bytes;
--
2.39.2
- [PULL 05/20] migration: Make multifd_bytes atomic, (continued)
- [PULL 05/20] migration: Make multifd_bytes atomic, Juan Quintela, 2023/04/20
- [PULL 07/20] migration: Make precopy_bytes atomic, Juan Quintela, 2023/04/20
- [PULL 13/20] migration: Rename duplicate to zero_pages, Juan Quintela, 2023/04/20
- [PULL 08/20] migration: Make downtime_bytes atomic, Juan Quintela, 2023/04/20
- [PULL 16/20] util/mmap-alloc: qemu_fd_getfs(), Juan Quintela, 2023/04/20
- [PULL 17/20] vl.c: Create late backends before migration object, Juan Quintela, 2023/04/20
- [PULL 18/20] migration/postcopy: Detect file system on dest host, Juan Quintela, 2023/04/20
- [PULL 19/20] migration: rename enabled_capabilities to capabilities, Juan Quintela, 2023/04/20
- [PULL 20/20] migration: Pass migrate_caps_check() the old and new caps, Juan Quintela, 2023/04/20
- [PULL 02/20] postcopy-ram: do not use qatomic_mb_read, Juan Quintela, 2023/04/20
- [PULL 14/20] migration: Rename normal to normal_pages,
Juan Quintela <=
- [PULL 10/20] migration: Make postcopy_requests atomic, Juan Quintela, 2023/04/20
- [PULL 15/20] migration: Handle block device inactivation failures better, Juan Quintela, 2023/04/20
- Re: [PULL 00/20] Migration 20230420 patches, Richard Henderson, 2023/04/22