aboutsummaryrefslogtreecommitdiff
path: root/migration/ram.c
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2017-03-14 18:41:03 +0100
committerJuan Quintela <quintela@redhat.com>2017-04-21 12:25:38 +0200
commit96506894a316bdb86ce9b78e906bc8ffb9697d5e (patch)
treed6c5d47de11303a23d57f4c82e2c645974008296 /migration/ram.c
parent47ad861976d8490047c53d5a80b562776f3c951b (diff)
ram: Move postcopy_requests into RAMState
Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Peter Xu <peterx@redhat.com>
Diffstat (limited to 'migration/ram.c')
-rw-r--r--migration/ram.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/migration/ram.c b/migration/ram.c
index c5240eb39d..b9f415c09d 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -214,6 +214,8 @@ struct RAMState {
uint64_t bytes_transferred;
/* number of dirtied pages in the last second */
uint64_t dirty_pages_rate;
+ /* Count of requests incoming from destination */
+ uint64_t postcopy_requests;
/* protects modification of the bitmap */
QemuMutex bitmap_mutex;
/* Ram Bitmap protected by RCU */
@@ -283,6 +285,11 @@ uint64_t ram_dirty_pages_rate(void)
return ram_state.dirty_pages_rate;
}
+uint64_t ram_postcopy_requests(void)
+{
+ return ram_state.postcopy_requests;
+}
+
/* used by the search for pages to send */
struct PageSearchStatus {
/* Current block being searched */
@@ -1240,19 +1247,17 @@ void migration_page_queue_free(void)
*
* Returns zero on success or negative on error
*
- * @ms: current migration state
* @rbname: Name of the RAMBLock of the request. NULL means the
* same that last one.
* @start: starting address from the start of the RAMBlock
* @len: length (in bytes) to send
*/
-int ram_save_queue_pages(MigrationState *ms, const char *rbname,
- ram_addr_t start, ram_addr_t len)
+int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len)
{
RAMBlock *ramblock;
RAMState *rs = &ram_state;
- ms->postcopy_requests++;
+ rs->postcopy_requests++;
rcu_read_lock();
if (!rbname) {
/* Reuse last RAMBlock */