diff options
| author | Juan Quintela <quintela@redhat.com> | 2017-03-13 20:43:34 +0100 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2017-04-21 12:25:36 +0200 |
| commit | 29cc3d8a9b595dfcd0c6fd75b8fd490b88fbb184 (patch) | |
| tree | 0bb505f874f8a37c4d51159e342cfa64bd31fc34 | |
| parent | b4d1c6e722b0b754de08e72125ef50b37b4a1b6e (diff) | |
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>
| -rw-r--r-- | include/migration/migration.h | 1 | ||||
| -rw-r--r-- | migration/migration.c | 3 | ||||
| -rw-r--r-- | migration/ram.c | 5 |
3 files changed, 2 insertions, 7 deletions
diff --git a/include/migration/migration.h b/include/migration/migration.h index bd0b60bbb4..87d0cc51e9 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 34c1a83ad8..7f7bab9523 100644 --- 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 587e2c7265..85d66ea08e 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; |