[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/51] ram: Remove norm_mig_bytes_transferred
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 15/51] ram: Remove norm_mig_bytes_transferred |
Date: |
Thu, 23 Mar 2017 21:45:08 +0100 |
Its value can be calculated by other exported.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
---
include/migration/migration.h | 1 -
migration/migration.c | 3 ++-
migration/ram.c | 5 -----
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/include/migration/migration.h b/include/migration/migration.h
index 9c83951..84cef4b 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -277,7 +277,6 @@ void free_xbzrle_decoded_buf(void);
void acct_update_position(QEMUFile *f, size_t size, bool zero);
uint64_t dup_mig_pages_transferred(void);
-uint64_t norm_mig_bytes_transferred(void);
uint64_t norm_mig_pages_transferred(void);
uint64_t xbzrle_mig_bytes_transferred(void);
uint64_t xbzrle_mig_pages_transferred(void);
diff --git a/migration/migration.c b/migration/migration.c
index c078157..e532430 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -646,7 +646,8 @@ static void populate_ram_info(MigrationInfo *info,
MigrationState *s)
/* legacy value. It is not used anymore */
info->ram->skipped = 0;
info->ram->normal = norm_mig_pages_transferred();
- info->ram->normal_bytes = norm_mig_bytes_transferred();
+ info->ram->normal_bytes = norm_mig_pages_transferred() *
+ (1ul << qemu_target_page_bits());
info->ram->mbps = s->mbps;
info->ram->dirty_sync_count = s->dirty_sync_count;
info->ram->postcopy_requests = s->postcopy_requests;
diff --git a/migration/ram.c b/migration/ram.c
index 2c36729..9fa3bd7 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -197,11 +197,6 @@ uint64_t dup_mig_pages_transferred(void)
return ram_state.zero_pages;
}
-uint64_t norm_mig_bytes_transferred(void)
-{
- return ram_state.norm_pages * TARGET_PAGE_SIZE;
-}
-
uint64_t norm_mig_pages_transferred(void)
{
return ram_state.norm_pages;
--
2.9.3
- [Qemu-devel] [PATCH 13/51] ram: Remove unused pages_skipped variable, (continued)
- [Qemu-devel] [PATCH 13/51] ram: Remove unused pages_skipped variable, Juan Quintela, 2017/03/23
- [Qemu-devel] [PATCH 12/51] ram: Remove unused dup_mig_bytes_transferred(), Juan Quintela, 2017/03/23
- [Qemu-devel] [PATCH 11/51] ram: Move dup_pages into RAMState, Juan Quintela, 2017/03/23
- [Qemu-devel] [PATCH 16/51] ram: Move iterations into RAMState, Juan Quintela, 2017/03/23
- [Qemu-devel] [PATCH 14/51] ram: Move norm_pages to RAMState, Juan Quintela, 2017/03/23
- [Qemu-devel] [PATCH 15/51] ram: Remove norm_mig_bytes_transferred,
Juan Quintela <=
- [Qemu-devel] [PATCH 17/51] ram: Move xbzrle_bytes into RAMState, Juan Quintela, 2017/03/23
- [Qemu-devel] [PATCH 18/51] ram: Move xbzrle_pages into RAMState, Juan Quintela, 2017/03/23
- [Qemu-devel] [PATCH 19/51] ram: Move xbzrle_cache_miss into RAMState, Juan Quintela, 2017/03/23
- [Qemu-devel] [PATCH 20/51] ram: Move xbzrle_cache_miss_rate into RAMState, Juan Quintela, 2017/03/23