Re: [Qemu-devel] [PATCH 39/51] ram: We don't need MigrationState parameter anymore

[Dr. David Alan Gilbert]

* Juan Quintela (address@hidden) wrote:
> Remove it from callers and callees.
> 
> Signed-off-by: Juan Quintela <address@hidden>

Reviewed-by: Dr. David Alan Gilbert <address@hidden>

> ---
>  migration/ram.c | 27 ++++++++++-----------------
>  1 file changed, 10 insertions(+), 17 deletions(-)
> 
> diff --git a/migration/ram.c b/migration/ram.c
> index cb5f06f..064b2c0 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -796,13 +796,11 @@ static void ram_release_pages(const char *rbname, 
> uint64_t offset, int pages)
>   *                if xbzrle noticed the page was the same.
>   *
>   * @rs: current RAM state
> - * @ms: current migration state
>   * @block: block that contains the page we want to send
>   * @offset: offset inside the block for the page
>   * @last_stage: if we are at the completion stage
>   */
> -static int ram_save_page(RAMState *rs, MigrationState *ms,
> -                         PageSearchStatus *pss, bool last_stage)
> +static int ram_save_page(RAMState *rs, PageSearchStatus *pss, bool 
> last_stage)
>  {
>      int pages = -1;
>      uint64_t bytes_xmit;
> @@ -976,13 +974,12 @@ static int compress_page_with_multi_thread(RAMState 
> *rs, RAMBlock *block,
>   * Returns the number of pages written.
>   *
>   * @rs: current RAM state
> - * @ms: current migration state
>   * @block: block that contains the page we want to send
>   * @offset: offset inside the block for the page
>   * @last_stage: if we are at the completion stage
>   */
> -static int ram_save_compressed_page(RAMState *rs, MigrationState *ms,
> -                                    PageSearchStatus *pss, bool last_stage)
> +static int ram_save_compressed_page(RAMState *rs, PageSearchStatus *pss,
> +                                    bool last_stage)
>  {
>      int pages = -1;
>      uint64_t bytes_xmit = 0;
> @@ -1312,10 +1309,8 @@ err:
>   * @last_stage: if we are at the completion stage
>   * @dirty_ram_abs: address of the start of the dirty page in ram_addr_t space
>   */
> -static int ram_save_target_page(RAMState *rs, MigrationState *ms,
> -                                PageSearchStatus *pss,
> -                                bool last_stage,
> -                                ram_addr_t dirty_ram_abs)
> +static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss,
> +                                bool last_stage, ram_addr_t dirty_ram_abs)
>  {
>      int res = 0;
>  
> @@ -1323,9 +1318,9 @@ static int ram_save_target_page(RAMState *rs, 
> MigrationState *ms,
>      if (migration_bitmap_clear_dirty(rs, dirty_ram_abs)) {
>          unsigned long *unsentmap;
>          if (!rs->preffer_xbzrle && migrate_use_compression()) {
> -            res = ram_save_compressed_page(rs, ms, pss, last_stage);
> +            res = ram_save_compressed_page(rs, pss, last_stage);
>          } else {
> -            res = ram_save_page(rs, ms, pss, last_stage);
> +            res = ram_save_page(rs, pss, last_stage);
>          }
>  
>          if (res < 0) {
> @@ -1364,8 +1359,7 @@ static int ram_save_target_page(RAMState *rs, 
> MigrationState *ms,
>   * @last_stage: if we are at the completion stage
>   * @dirty_ram_abs: Address of the start of the dirty page in ram_addr_t space
>   */
> -static int ram_save_host_page(RAMState *rs, MigrationState *ms,
> -                              PageSearchStatus *pss,
> +static int ram_save_host_page(RAMState *rs, PageSearchStatus *pss,
>                                bool last_stage,
>                                ram_addr_t dirty_ram_abs)
>  {
> @@ -1373,7 +1367,7 @@ static int ram_save_host_page(RAMState *rs, 
> MigrationState *ms,
>      size_t pagesize = qemu_ram_pagesize(pss->block);
>  
>      do {
> -        tmppages = ram_save_target_page(rs, ms, pss, last_stage, 
> dirty_ram_abs);
> +        tmppages = ram_save_target_page(rs, pss, last_stage, dirty_ram_abs);
>          if (tmppages < 0) {
>              return tmppages;
>          }
> @@ -1405,7 +1399,6 @@ static int ram_save_host_page(RAMState *rs, 
> MigrationState *ms,
>  static int ram_find_and_save_block(RAMState *rs, bool last_stage)
>  {
>      PageSearchStatus pss;
> -    MigrationState *ms = migrate_get_current();
>      int pages = 0;
>      bool again, found;
>      ram_addr_t dirty_ram_abs; /* Address of the start of the dirty page in
> @@ -1434,7 +1427,7 @@ static int ram_find_and_save_block(RAMState *rs, bool 
> last_stage)
>          }
>  
>          if (found) {
> -            pages = ram_save_host_page(rs, ms, &pss, last_stage, 
> dirty_ram_abs);
> +            pages = ram_save_host_page(rs, &pss, last_stage, dirty_ram_abs);
>          }
>      } while (!pages && again);
>  
> -- 
> 2.9.3
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK