openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ram: Rename flush_page_queue() to migration_page_queue_free() 

It reflects better what it does.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Juan Quintela 2017-04-03 22:06:54 +02:00
parent 3d0684b2ad
commit 5e58f968f4
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/migration/migration.h
View File

@ -377,7 +377,7 @@ void savevm_skip_configuration(void);
int global_state_store(void); int global_state_store(void);
void global_state_store_running(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, int ram_save_queue_pages(MigrationState *ms, const char *rbname,
ram_addr_t start, ram_addr_t len); ram_addr_t start, ram_addr_t len);
uint64_t ram_pagesize_summary(void); uint64_t ram_pagesize_summary(void);

2
migration/migration.c
View File

@ -955,7 +955,7 @@ static void migrate_fd_cleanup(void *opaque)
qemu_bh_delete(s->cleanup_bh); qemu_bh_delete(s->cleanup_bh);
s->cleanup_bh = NULL; s->cleanup_bh = NULL;
flush_page_queue(s); migration_page_queue_free(s);
if (s->to_dst_file) { if (s->to_dst_file) {
trace_migrate_fd_cleanup(); trace_migrate_fd_cleanup();

5
migration/ram.c
View File

@ -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 * 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. * be some left. in case that there is any page left, we drop it.
* *
* @ms: current migration state * @ms: current migration state
*/ */
void flush_page_queue(MigrationState *ms) void migration_page_queue_free(MigrationState *ms)
{ {
struct MigrationSrcPageRequest *mspr, *next_mspr; struct MigrationSrcPageRequest *mspr, *next_mspr;
/* This queue generally should be empty - but in the case of a failed /* This queue generally should be empty - but in the case of a failed