@@ -789,8 +789,7 @@ unsigned long migration_bitmap_find_dirty(RAMState *rs, RAMBlock *rb,
789
789
return find_next_bit (bitmap , size , start );
790
790
}
791
791
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 ,
794
793
unsigned long page )
795
794
{
796
795
uint8_t shift ;
@@ -818,8 +817,7 @@ static void migration_clear_memory_region_dirty_bitmap(RAMState *rs,
818
817
}
819
818
820
819
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 ,
823
821
unsigned long start ,
824
822
unsigned long npages )
825
823
{
@@ -832,7 +830,7 @@ migration_clear_memory_region_dirty_bitmap_range(RAMState *rs,
832
830
* exclusive.
833
831
*/
834
832
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 );
836
834
}
837
835
}
838
836
@@ -850,7 +848,7 @@ static inline bool migration_bitmap_clear_dirty(RAMState *rs,
850
848
* the page in the chunk we clear the remote dirty bitmap for all.
851
849
* Clearing it earlier won't be a problem, but too late will.
852
850
*/
853
- migration_clear_memory_region_dirty_bitmap (rs , rb , page );
851
+ migration_clear_memory_region_dirty_bitmap (rb , page );
854
852
855
853
ret = test_and_clear_bit (page , rb -> bmap );
856
854
if (ret ) {
@@ -2777,8 +2775,7 @@ void qemu_guest_free_page_hint(void *addr, size_t len)
2777
2775
* are initially set. Otherwise those skipped pages will be sent in
2778
2776
* the next round after syncing from the memory region bitmap.
2779
2777
*/
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 );
2782
2779
ram_state -> migration_dirty_pages -=
2783
2780
bitmap_count_one_with_offset (block -> bmap , start , npages );
2784
2781
bitmap_clear (block -> bmap , start , npages );
0 commit comments