From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58474) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwQ9U-0007ZD-VP for qemu-devel@nongnu.org; Fri, 07 Apr 2017 05:25:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cwQ9Q-0000Nx-04 for qemu-devel@nongnu.org; Fri, 07 Apr 2017 05:25:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51592) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cwQ9P-0000N2-Q4 for qemu-devel@nongnu.org; Fri, 07 Apr 2017 05:25:51 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B5365C065871 for ; Fri, 7 Apr 2017 09:25:50 +0000 (UTC) Date: Fri, 7 Apr 2017 10:25:47 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20170407092547.GB2138@work-vm> References: <20170406130913.2232-1-quintela@redhat.com> <20170406130913.2232-3-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170406130913.2232-3-quintela@redhat.com> Subject: Re: [Qemu-devel] [PATCH 02/54] ram: Rename flush_page_queue() to migration_page_queue_free() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org * Juan Quintela (quintela@redhat.com) wrote: > It reflects better what it does. > > Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert > --- > include/migration/migration.h | 2 +- > migration/migration.c | 2 +- > migration/ram.c | 5 +++-- > 3 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/include/migration/migration.h b/include/migration/migration.h > index 5720c88..24487be 100644 > --- a/include/migration/migration.h > +++ b/include/migration/migration.h > @@ -377,7 +377,7 @@ void savevm_skip_configuration(void); > int global_state_store(void); > void global_state_store_running(void); > > -void flush_page_queue(MigrationState *ms); > +void migration_page_queue_free(MigrationState *ms); > int ram_save_queue_pages(MigrationState *ms, const char *rbname, > ram_addr_t start, ram_addr_t len); > uint64_t ram_pagesize_summary(void); > diff --git a/migration/migration.c b/migration/migration.c > index 54060f7..7ce8d43 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -947,7 +947,7 @@ static void migrate_fd_cleanup(void *opaque) > qemu_bh_delete(s->cleanup_bh); > s->cleanup_bh = NULL; > > - flush_page_queue(s); > + migration_page_queue_free(s); > > if (s->to_dst_file) { > trace_migrate_fd_cleanup(); > diff --git a/migration/ram.c b/migration/ram.c > index 652abe4..356f8ce 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -1186,14 +1186,15 @@ static bool get_queued_page(MigrationState *ms, PageSearchStatus *pss, > } > > /** > - * flush_page_queue: flush any remaining pages in the ram request queue > + * migration_page_queue_free: drop any remaining pages in the ram > + * request queue > * > * It should be empty at the end anyway, but in error cases there may > * be some left. in case that there is any page left, we drop it. > * > * @ms: current migration state > */ > -void flush_page_queue(MigrationState *ms) > +void migration_page_queue_free(MigrationState *ms) > { > struct MigrationSrcPageRequest *mspr, *next_mspr; > /* This queue generally should be empty - but in the case of a failed > -- > 2.9.3 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK