* Juan Quintela (quintela@redhat.com) wrote:
> 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>
Note missing p in subject,
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> include/migration/migration.h | 2 --
> migration/migration.c | 3 ++-
> migration/ram.c | 11 -----------
> 3 files changed, 2 insertions(+), 14 deletions(-)
>
> diff --git a/include/migration/migration.h b/include/migration/migration.h
> index 3e6bb68..9c83951 100644
> --- a/include/migration/migration.h
> +++ b/include/migration/migration.h
> @@ -277,8 +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 skipped_mig_bytes_transferred(void);
> -uint64_t skipped_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);
> diff --git a/migration/migration.c b/migration/migration.c
> index 3dab684..c3e1b95 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -639,7 +639,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 83fe20a..468f042 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -169,7 +169,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;
> @@ -191,16 +190,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;
> --
> 2.9.3
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK