diff mbox

[v2,1/3] migration: add MigrationState arg for ram_save_/compressed_/page()

Message ID 20170203152321.19739-2-pbutsykin@virtuozzo.com
State New
Headers show

Commit Message

Pavel Butsykin Feb. 3, 2017, 3:23 p.m. UTC 
Cosmetic patch. The use of ms variable instead of migrate_get_current()
looks nicer, especially when there reuse.

Signed-off-by: Pavel Butsykin <pbutsykin@virtuozzo.com>
---
 migration/ram.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

Comments

Dr. David Alan Gilbert Feb. 10, 2017, 11:54 a.m. UTC | #1 
* Pavel Butsykin (pbutsykin@virtuozzo.com) wrote:
> Cosmetic patch. The use of ms variable instead of migrate_get_current()
> looks nicer, especially when there reuse.
> 
> Signed-off-by: Pavel Butsykin <pbutsykin@virtuozzo.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
>  migration/ram.c | 15 ++++++++-------
>  1 file changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/migration/ram.c b/migration/ram.c
> index a683f4bb9e..d866b6518b 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -734,13 +734,14 @@ static int save_zero_page(QEMUFile *f, RAMBlock *block, ram_addr_t offset,
>   *          >=0 - Number of pages written - this might legally be 0
>   *                if xbzrle noticed the page was the same.
>   *
> + * @ms: The current migration state.
>   * @f: QEMUFile where to send the data
>   * @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
>   * @bytes_transferred: increase it with the number of transferred bytes
>   */
> -static int ram_save_page(QEMUFile *f, PageSearchStatus *pss,
> +static int ram_save_page(MigrationState *ms, QEMUFile *f, PageSearchStatus *pss,
>                           bool last_stage, uint64_t *bytes_transferred)
>  {
>      int pages = -1;
> @@ -786,8 +787,7 @@ static int ram_save_page(QEMUFile *f, PageSearchStatus *pss,
>               */
>              xbzrle_cache_zero_page(current_addr);
>          } else if (!ram_bulk_stage &&
> -                   !migration_in_postcopy(migrate_get_current()) &&
> -                   migrate_use_xbzrle()) {
> +                   !migration_in_postcopy(ms) && migrate_use_xbzrle()) {
>              pages = save_xbzrle_page(f, &p, current_addr, block,
>                                       offset, last_stage, bytes_transferred);
>              if (!last_stage) {
> @@ -914,14 +914,15 @@ static int compress_page_with_multi_thread(QEMUFile *f, RAMBlock *block,
>   *
>   * Returns: Number of pages written.
>   *
> + * @ms: The current migration state.
>   * @f: QEMUFile where to send the data
>   * @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
>   * @bytes_transferred: increase it with the number of transferred bytes
>   */
> -static int ram_save_compressed_page(QEMUFile *f, PageSearchStatus *pss,
> -                                    bool last_stage,
> +static int ram_save_compressed_page(MigrationState *ms, QEMUFile *f,
> +                                    PageSearchStatus *pss, bool last_stage,
>                                      uint64_t *bytes_transferred)
>  {
>      int pages = -1;
> @@ -1252,11 +1253,11 @@ static int ram_save_target_page(MigrationState *ms, QEMUFile *f,
>      if (migration_bitmap_clear_dirty(dirty_ram_abs)) {
>          unsigned long *unsentmap;
>          if (compression_switch && migrate_use_compression()) {
> -            res = ram_save_compressed_page(f, pss,
> +            res = ram_save_compressed_page(ms, f, pss,
>                                             last_stage,
>                                             bytes_transferred);
>          } else {
> -            res = ram_save_page(f, pss, last_stage,
> +            res = ram_save_page(ms, f, pss, last_stage,
>                                  bytes_transferred);
>          }
>  
> -- 
> 2.11.0
> 
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
Philippe Mathieu-Daudé Feb. 14, 2017, 11:22 p.m. UTC | #2 
On 02/03/2017 12:23 PM, Pavel Butsykin wrote:
> Cosmetic patch. The use of ms variable instead of migrate_get_current()
> looks nicer, especially when there reuse.
>
> Signed-off-by: Pavel Butsykin <pbutsykin@virtuozzo.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  migration/ram.c | 15 ++++++++-------
>  1 file changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/migration/ram.c b/migration/ram.c
> index a683f4bb9e..d866b6518b 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -734,13 +734,14 @@ static int save_zero_page(QEMUFile *f, RAMBlock *block, ram_addr_t offset,
>   *          >=0 - Number of pages written - this might legally be 0
>   *                if xbzrle noticed the page was the same.
>   *
> + * @ms: The current migration state.
>   * @f: QEMUFile where to send the data
>   * @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
>   * @bytes_transferred: increase it with the number of transferred bytes
>   */
> -static int ram_save_page(QEMUFile *f, PageSearchStatus *pss,
> +static int ram_save_page(MigrationState *ms, QEMUFile *f, PageSearchStatus *pss,
>                           bool last_stage, uint64_t *bytes_transferred)
>  {
>      int pages = -1;
> @@ -786,8 +787,7 @@ static int ram_save_page(QEMUFile *f, PageSearchStatus *pss,
>               */
>              xbzrle_cache_zero_page(current_addr);
>          } else if (!ram_bulk_stage &&
> -                   !migration_in_postcopy(migrate_get_current()) &&
> -                   migrate_use_xbzrle()) {
> +                   !migration_in_postcopy(ms) && migrate_use_xbzrle()) {
>              pages = save_xbzrle_page(f, &p, current_addr, block,
>                                       offset, last_stage, bytes_transferred);
>              if (!last_stage) {
> @@ -914,14 +914,15 @@ static int compress_page_with_multi_thread(QEMUFile *f, RAMBlock *block,
>   *
>   * Returns: Number of pages written.
>   *
> + * @ms: The current migration state.
>   * @f: QEMUFile where to send the data
>   * @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
>   * @bytes_transferred: increase it with the number of transferred bytes
>   */
> -static int ram_save_compressed_page(QEMUFile *f, PageSearchStatus *pss,
> -                                    bool last_stage,
> +static int ram_save_compressed_page(MigrationState *ms, QEMUFile *f,
> +                                    PageSearchStatus *pss, bool last_stage,
>                                      uint64_t *bytes_transferred)
>  {
>      int pages = -1;
> @@ -1252,11 +1253,11 @@ static int ram_save_target_page(MigrationState *ms, QEMUFile *f,
>      if (migration_bitmap_clear_dirty(dirty_ram_abs)) {
>          unsigned long *unsentmap;
>          if (compression_switch && migrate_use_compression()) {
> -            res = ram_save_compressed_page(f, pss,
> +            res = ram_save_compressed_page(ms, f, pss,
>                                             last_stage,
>                                             bytes_transferred);
>          } else {
> -            res = ram_save_page(f, pss, last_stage,
> +            res = ram_save_page(ms, f, pss, last_stage,
>                                  bytes_transferred);
>          }
>
>
diff mbox

Patch

diff --git a/migration/ram.c b/migration/ram.c
index a683f4bb9e..d866b6518b 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -734,13 +734,14 @@  static int save_zero_page(QEMUFile *f, RAMBlock *block, ram_addr_t offset,
  *          >=0 - Number of pages written - this might legally be 0
  *                if xbzrle noticed the page was the same.
  *
+ * @ms: The current migration state.
  * @f: QEMUFile where to send the data
  * @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
  * @bytes_transferred: increase it with the number of transferred bytes
  */
-static int ram_save_page(QEMUFile *f, PageSearchStatus *pss,
+static int ram_save_page(MigrationState *ms, QEMUFile *f, PageSearchStatus *pss,
                          bool last_stage, uint64_t *bytes_transferred)
 {
     int pages = -1;
@@ -786,8 +787,7 @@  static int ram_save_page(QEMUFile *f, PageSearchStatus *pss,
              */
             xbzrle_cache_zero_page(current_addr);
         } else if (!ram_bulk_stage &&
-                   !migration_in_postcopy(migrate_get_current()) &&
-                   migrate_use_xbzrle()) {
+                   !migration_in_postcopy(ms) && migrate_use_xbzrle()) {
             pages = save_xbzrle_page(f, &p, current_addr, block,
                                      offset, last_stage, bytes_transferred);
             if (!last_stage) {
@@ -914,14 +914,15 @@  static int compress_page_with_multi_thread(QEMUFile *f, RAMBlock *block,
  *
  * Returns: Number of pages written.
  *
+ * @ms: The current migration state.
  * @f: QEMUFile where to send the data
  * @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
  * @bytes_transferred: increase it with the number of transferred bytes
  */
-static int ram_save_compressed_page(QEMUFile *f, PageSearchStatus *pss,
-                                    bool last_stage,
+static int ram_save_compressed_page(MigrationState *ms, QEMUFile *f,
+                                    PageSearchStatus *pss, bool last_stage,
                                     uint64_t *bytes_transferred)
 {
     int pages = -1;
@@ -1252,11 +1253,11 @@  static int ram_save_target_page(MigrationState *ms, QEMUFile *f,
     if (migration_bitmap_clear_dirty(dirty_ram_abs)) {
         unsigned long *unsentmap;
         if (compression_switch && migrate_use_compression()) {
-            res = ram_save_compressed_page(f, pss,
+            res = ram_save_compressed_page(ms, f, pss,
                                            last_stage,
                                            bytes_transferred);
         } else {
-            res = ram_save_page(f, pss, last_stage,
+            res = ram_save_page(ms, f, pss, last_stage,
                                 bytes_transferred);
         }