From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58291) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cc9mI-00076i-Ow for qemu-devel@nongnu.org; Fri, 10 Feb 2017 06:54:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cc9mD-000847-UU for qemu-devel@nongnu.org; Fri, 10 Feb 2017 06:54:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35488) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cc9mD-00083v-Ly for qemu-devel@nongnu.org; Fri, 10 Feb 2017 06:54:09 -0500 Date: Fri, 10 Feb 2017 11:54:04 +0000 From: "Dr. David Alan Gilbert" Message-ID: <20170210115403.GA3567@work-vm> References: <20170203152321.19739-1-pbutsykin@virtuozzo.com> <20170203152321.19739-2-pbutsykin@virtuozzo.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170203152321.19739-2-pbutsykin@virtuozzo.com> Subject: Re: [Qemu-devel] [PATCH v2 1/3] migration: add MigrationState arg for ram_save_/compressed_/page() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Pavel Butsykin Cc: qemu-devel@nongnu.org, quintela@redhat.com, armbru@redhat.com, amit.shah@redhat.com, den@openvz.org * 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 Reviewed-by: Dr. David Alan Gilbert > --- > 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