Skip to content

Commit 1230a25

Browse files
davidhildenbrandJuan Quintela
authored andcommitted
migration/ram: Don't passs RAMState to migration_clear_memory_region_dirty_bitmap_*()
The parameter is unused, let's drop it. Reviewed-by: Peter Xu <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Juan Quintela <[email protected]> Signed-off-by: David Hildenbrand <[email protected]> Signed-off-by: Juan Quintela <[email protected]>
1 parent e9ab82b commit 1230a25

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

migration/ram.c

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -789,8 +789,7 @@ unsigned long migration_bitmap_find_dirty(RAMState *rs, RAMBlock *rb,
789789
return find_next_bit(bitmap, size, start);
790790
}
791791

792-
static void migration_clear_memory_region_dirty_bitmap(RAMState *rs,
793-
RAMBlock *rb,
792+
static void migration_clear_memory_region_dirty_bitmap(RAMBlock *rb,
794793
unsigned long page)
795794
{
796795
uint8_t shift;
@@ -818,8 +817,7 @@ static void migration_clear_memory_region_dirty_bitmap(RAMState *rs,
818817
}
819818

820819
static void
821-
migration_clear_memory_region_dirty_bitmap_range(RAMState *rs,
822-
RAMBlock *rb,
820+
migration_clear_memory_region_dirty_bitmap_range(RAMBlock *rb,
823821
unsigned long start,
824822
unsigned long npages)
825823
{
@@ -832,7 +830,7 @@ migration_clear_memory_region_dirty_bitmap_range(RAMState *rs,
832830
* exclusive.
833831
*/
834832
for (i = chunk_start; i < chunk_end; i += chunk_pages) {
835-
migration_clear_memory_region_dirty_bitmap(rs, rb, i);
833+
migration_clear_memory_region_dirty_bitmap(rb, i);
836834
}
837835
}
838836

@@ -850,7 +848,7 @@ static inline bool migration_bitmap_clear_dirty(RAMState *rs,
850848
* the page in the chunk we clear the remote dirty bitmap for all.
851849
* Clearing it earlier won't be a problem, but too late will.
852850
*/
853-
migration_clear_memory_region_dirty_bitmap(rs, rb, page);
851+
migration_clear_memory_region_dirty_bitmap(rb, page);
854852

855853
ret = test_and_clear_bit(page, rb->bmap);
856854
if (ret) {
@@ -2777,8 +2775,7 @@ void qemu_guest_free_page_hint(void *addr, size_t len)
27772775
* are initially set. Otherwise those skipped pages will be sent in
27782776
* the next round after syncing from the memory region bitmap.
27792777
*/
2780-
migration_clear_memory_region_dirty_bitmap_range(ram_state, block,
2781-
start, npages);
2778+
migration_clear_memory_region_dirty_bitmap_range(block, start, npages);
27822779
ram_state->migration_dirty_pages -=
27832780
bitmap_count_one_with_offset(block->bmap, start, npages);
27842781
bitmap_clear(block->bmap, start, npages);

0 commit comments

Comments
 (0)