[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/65] ram: Rename flush_page_queue() to migration_pa
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 02/65] ram: Rename flush_page_queue() to migration_page_queue_free() |
Date: |
Fri, 21 Apr 2017 13:55:43 +0200 |
It reflects better what it does.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
---
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 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
--
2.9.3
- [Qemu-devel] [PULL 00/65] Migration pull request, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 02/65] ram: Rename flush_page_queue() to migration_page_queue_free(),
Juan Quintela <=
- [Qemu-devel] [PULL 03/65] ram: Rename block_name to rbname, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 01/65] ram: Update all functions comments, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 05/65] ram: Add dirty_rate_high_cnt to RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 04/65] ram: Create RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 06/65] ram: Move bitmap_sync_count into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 07/65] ram: Move start time into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 08/65] ram: Move bytes_xfer_prev into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 11/65] ram: Change num_dirty_pages_period type to uint64_t, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 10/65] ram: Move num_dirty_pages_period into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 13/65] ram: Move iterations_prev into RAMState, Juan Quintela, 2017/04/21