From 5e58f968f432cc079e2c53c07fdf0d4801d2bde5 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Mon, 3 Apr 2017 22:06:54 +0200 Subject: ram: Rename flush_page_queue() to migration_page_queue_free() It reflects better what it does. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Peter Xu --- migration/migration.c | 2 +- migration/ram.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'migration') diff --git a/migration/migration.c b/migration/migration.c index ad4036f..4bee05d 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -955,7 +955,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 -- cgit v1.1