summary refs log tree commit diff stats
path: root/migration/ram.c
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2017-03-21 11:35:24 +0100
committerJuan Quintela <quintela@redhat.com>2017-04-21 12:25:39 +0200
commitaaa2064c2ae25ef833b3324aedeba9a6363bd5ec (patch)
tree55ab769cf5fb821dcc69664c46a3414429dd6eb1 /migration/ram.c
parent15440dd5a08a6b10538b9e62c6d95ac8a838d78a (diff)
downloadfocaccia-qemu-aaa2064c2ae25ef833b3324aedeba9a6363bd5ec.tar.gz
focaccia-qemu-aaa2064c2ae25ef833b3324aedeba9a6363bd5ec.zip
ram: ram_discard_range() don't use the mis parameter
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.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/migration/ram.c b/migration/ram.c
index 3f3842a38b..9ed91e51b3 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -782,7 +782,7 @@ static void ram_release_pages(const char *rbname, uint64_t offset, int pages)
         return;
     }
 
-    ram_discard_range(NULL, rbname, offset, pages << TARGET_PAGE_BITS);
+    ram_discard_range(rbname, offset, pages << TARGET_PAGE_BITS);
 }
 
 /**
@@ -1608,7 +1608,7 @@ void ram_postcopy_migrated_memory_release(MigrationState *ms)
 
         while (run_start < range) {
             unsigned long run_end = find_next_bit(bitmap, range, run_start + 1);
-            ram_discard_range(NULL, block->idstr, run_start << TARGET_PAGE_BITS,
+            ram_discard_range(block->idstr, run_start << TARGET_PAGE_BITS,
                               (run_end - run_start) << TARGET_PAGE_BITS);
             run_start = find_next_zero_bit(bitmap, range, run_end + 1);
         }
@@ -1948,15 +1948,12 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms)
  *
  * Returns zero on success
  *
- * @mis: current migration incoming state
  * @rbname: name of the RAMBlock of the request. NULL means the
  *          same that last one.
  * @start: RAMBlock starting page
  * @length: RAMBlock size
  */
-int ram_discard_range(MigrationIncomingState *mis,
-                      const char *rbname,
-                      uint64_t start, size_t length)
+int ram_discard_range(const char *rbname, uint64_t start, size_t length)
 {
     int ret = -1;