ram: Remove norm_mig_bytes_transferred

Its value can be calculated by other exported.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

diff --git a/include/migration/migration.h b/include/migration/migration.h
index bd0b60bbb403dd71112ef0f1f5b136b410f8187a..87d0cc51e9148e4742a2c57ccd327ea7dcf469a5 100644 (file)
--- 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 34c1a83ad810316f4bdb6382822942c064827a2b..7f7bab95239630ecff8a07f796bb9f67c4343aa0 100644 (file)
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -654,7 +654,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 587e2c7265576df40a4d14d497a2cdd00ead4bc0..85d66ea08e6af3988b2b18ebfba084e3cf580320 100644 (file)
--- 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;