summaryrefslogtreecommitdiffstats
path: root/migration
diff options
context:
space:
mode:
authorJuan Quintela2017-03-13 20:35:54 +0100
committerJuan Quintela2017-04-21 12:25:36 +0200
commitbedf53c14c35f6121c11f81b6c72714804177550 (patch)
tree73a1f5648e138fecbea278ddb7a4567a83dc9630 /migration
parentram: Remove unused dup_mig_bytes_transferred() (diff)
downloadqemu-bedf53c14c35f6121c11f81b6c72714804177550.tar.gz
qemu-bedf53c14c35f6121c11f81b6c72714804177550.tar.xz
qemu-bedf53c14c35f6121c11f81b6c72714804177550.zip
ram: Remove unused pages_skipped variable
For compatibility, we need to still send a value, but just specify it and comment the fact. Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Peter Xu <peterx@redhat.com>
Diffstat (limited to 'migration')
-rw-r--r--migration/migration.c3
-rw-r--r--migration/ram.c11
2 files changed, 2 insertions, 12 deletions
diff --git a/migration/migration.c b/migration/migration.c
index 4bee05de9e..34c1a83ad8 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -651,7 +651,8 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
info->ram->transferred = ram_bytes_transferred();
info->ram->total = ram_bytes_total();
info->ram->duplicate = dup_mig_pages_transferred();
- info->ram->skipped = skipped_mig_pages_transferred();
+ /* 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->mbps = s->mbps;
diff --git a/migration/ram.c b/migration/ram.c
index 1398597202..78c7f3d6aa 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -175,7 +175,6 @@ static RAMState ram_state;
/* accounting for migration statistics */
typedef struct AccountingInfo {
- uint64_t skipped_pages;
uint64_t norm_pages;
uint64_t iterations;
uint64_t xbzrle_bytes;
@@ -197,16 +196,6 @@ uint64_t dup_mig_pages_transferred(void)
return ram_state.zero_pages;
}
-uint64_t skipped_mig_bytes_transferred(void)
-{
- return acct_info.skipped_pages * TARGET_PAGE_SIZE;
-}
-
-uint64_t skipped_mig_pages_transferred(void)
-{
- return acct_info.skipped_pages;
-}
-
uint64_t norm_mig_bytes_transferred(void)
{
return acct_info.norm_pages * TARGET_PAGE_SIZE;