diff mbox series

[v2,11/16] migration/RDMA: It is accounting for zero/normal pages in two places

Message ID 20230515195709.63843-12-quintela@redhat.com
State New
Headers show
Series Migration: More migration atomic counters | expand

Commit Message

Juan Quintela May 15, 2023, 7:57 p.m. UTC 
Remove the one in control_save_page().

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration/ram.c | 7 -------
 1 file changed, 7 deletions(-)

Comments

Leonardo Bras May 25, 2023, 7:06 a.m. UTC | #1 
On Mon, 2023-05-15 at 21:57 +0200, Juan Quintela wrote:
> Remove the one in control_save_page().
> 
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  migration/ram.c | 7 -------
>  1 file changed, 7 deletions(-)
> 
> diff --git a/migration/ram.c b/migration/ram.c
> index a706edecc0..67ed49b387 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -1191,13 +1191,6 @@ static bool control_save_page(PageSearchStatus *pss, RAMBlock *block,
>      if (ret == RAM_SAVE_CONTROL_DELAYED) {
>          return true;
>      }
> -
> -    if (bytes_xmit > 0) {
> -        stat64_add(&mig_stats.normal_pages, 1);
> -    } else if (bytes_xmit == 0) {
> -        stat64_add(&mig_stats.zero_pages, 1);
> -    }
> -
>      return true;
>  }
>  


ram_save_target_page_legacy() calls both control_save_page() and
save_zero_page() which increment zero-pages.

It also calls ram_save_page() which increments normal-pages.

Reviewed-by: Leonardo Bras <leobras@redhat.com>
diff mbox series

Patch

diff --git a/migration/ram.c b/migration/ram.c
index a706edecc0..67ed49b387 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1191,13 +1191,6 @@  static bool control_save_page(PageSearchStatus *pss, RAMBlock *block,
     if (ret == RAM_SAVE_CONTROL_DELAYED) {
         return true;
     }
-
-    if (bytes_xmit > 0) {
-        stat64_add(&mig_stats.normal_pages, 1);
-    } else if (bytes_xmit == 0) {
-        stat64_add(&mig_stats.zero_pages, 1);
-    }
-
     return true;
 }