Re: [PATCH v1 05/59] ram.c: remove unneeded labels

[Dr. David Alan Gilbert]

* Daniel Henrique Barboza (address@hidden) wrote:
> ram_save_queue_pages() has an 'err' label that can be replaced by
> 'return -1' instead.
> 
> Same thing with ram_discard_range(), and in this case we can also
> get rid of the 'ret' variable and return either '-1' on error
> or the result of ram_block_discard_range().
> 
> CC: Juan Quintela <address@hidden>
> CC: Dr. David Alan Gilbert <address@hidden>
> Signed-off-by: Daniel Henrique Barboza <address@hidden>

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

> ---
>  migration/ram.c | 18 +++++-------------
>  1 file changed, 5 insertions(+), 13 deletions(-)
> 
> diff --git a/migration/ram.c b/migration/ram.c
> index 96feb4062c..980cc644d7 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -2434,7 +2434,7 @@ int ram_save_queue_pages(const char *rbname, ram_addr_t 
> start, ram_addr_t len)
>               * it's the 1st request.
>               */
>              error_report("ram_save_queue_pages no previous block");
> -            goto err;
> +            return -1;
>          }
>      } else {
>          ramblock = qemu_ram_block_by_name(rbname);
> @@ -2442,7 +2442,7 @@ int ram_save_queue_pages(const char *rbname, ram_addr_t 
> start, ram_addr_t len)
>          if (!ramblock) {
>              /* We shouldn't be asked for a non-existent RAMBlock */
>              error_report("ram_save_queue_pages no block '%s'", rbname);
> -            goto err;
> +            return -1;
>          }
>          rs->last_req_rb = ramblock;
>      }
> @@ -2451,7 +2451,7 @@ int ram_save_queue_pages(const char *rbname, ram_addr_t 
> start, ram_addr_t len)
>          error_report("%s request overrun start=" RAM_ADDR_FMT " len="
>                       RAM_ADDR_FMT " blocklen=" RAM_ADDR_FMT,
>                       __func__, start, len, ramblock->used_length);
> -        goto err;
> +        return -1;
>      }
>  
>      struct RAMSrcPageRequest *new_entry =
> @@ -2467,9 +2467,6 @@ int ram_save_queue_pages(const char *rbname, ram_addr_t 
> start, ram_addr_t len)
>      qemu_mutex_unlock(&rs->src_page_req_mutex);
>  
>      return 0;
> -
> -err:
> -    return -1;
>  }
>  
>  static bool save_page_use_compression(RAMState *rs)
> @@ -3072,8 +3069,6 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms)
>   */
>  int ram_discard_range(const char *rbname, uint64_t start, size_t length)
>  {
> -    int ret = -1;
> -
>      trace_ram_discard_range(rbname, start, length);
>  
>      RCU_READ_LOCK_GUARD();
> @@ -3081,7 +3076,7 @@ int ram_discard_range(const char *rbname, uint64_t 
> start, size_t length)
>  
>      if (!rb) {
>          error_report("ram_discard_range: Failed to find block '%s'", rbname);
> -        goto err;
> +        return -1;
>      }
>  
>      /*
> @@ -3093,10 +3088,7 @@ int ram_discard_range(const char *rbname, uint64_t 
> start, size_t length)
>                       length >> qemu_target_page_bits());
>      }
>  
> -    ret = ram_block_discard_range(rb, start, length);
> -
> -err:
> -    return ret;
> +    return ram_block_discard_range(rb, start, length);
>  }
>  
>  /*
> -- 
> 2.24.1
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK