| Message ID | 20170406130913.2232-3-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
* Juan Quintela (quintela@redhat.com) wrote: > It reflects better what it does. > > Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > 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
On Thu, Apr 06, 2017 at 03:08:21PM +0200, Juan Quintela wrote: > It reflects better what it does. > > Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Peter Xu <peterx@redhat.com> Thanks, -- peterx
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
It reflects better what it does. Signed-off-by: Juan Quintela <quintela@redhat.com> --- include/migration/migration.h | 2 +- migration/migration.c | 2 +- migration/ram.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-)