| Message ID | 20170406130913.2232-46-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
* Juan Quintela (quintela@redhat.com) wrote: > We change the meaning of start to be the offset from the beggining of > the block. > > Signed-off-by: Juan Quintela <quintela@redhat.com> Still a little nervous about whether we want to pass RB all the way down to cpu_* but OK. Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > include/exec/ram_addr.h | 2 ++ > migration/ram.c | 8 ++++---- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h > index 9aadc5c..8a1372c 100644 > --- a/include/exec/ram_addr.h > +++ b/include/exec/ram_addr.h > @@ -354,11 +354,13 @@ static inline void cpu_physical_memory_clear_dirty_range(ram_addr_t start, > > static inline > uint64_t cpu_physical_memory_sync_dirty_bitmap(unsigned long *dest, > + RAMBlock *rb, > ram_addr_t start, > ram_addr_t length, > uint64_t *real_dirty_pages) > { > ram_addr_t addr; > + start = rb->offset + start; > unsigned long page = BIT_WORD(start >> TARGET_PAGE_BITS); > uint64_t num_dirty = 0; > > diff --git a/migration/ram.c b/migration/ram.c > index fe01e7b..3f3842a 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -646,13 +646,13 @@ static inline bool migration_bitmap_clear_dirty(RAMState *rs, ram_addr_t addr) > return ret; > } > > -static void migration_bitmap_sync_range(RAMState *rs, ram_addr_t start, > - ram_addr_t length) > +static void migration_bitmap_sync_range(RAMState *rs, RAMBlock *rb, > + ram_addr_t start, ram_addr_t length) > { > unsigned long *bitmap; > bitmap = atomic_rcu_read(&rs->ram_bitmap)->bmap; > rs->migration_dirty_pages += > - cpu_physical_memory_sync_dirty_bitmap(bitmap, start, length, > + cpu_physical_memory_sync_dirty_bitmap(bitmap, rb, start, length, > &rs->num_dirty_pages_period); > } > > @@ -699,7 +699,7 @@ static void migration_bitmap_sync(RAMState *rs) > qemu_mutex_lock(&rs->bitmap_mutex); > rcu_read_lock(); > QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { > - migration_bitmap_sync_range(rs, block->offset, block->used_length); > + migration_bitmap_sync_range(rs, block, 0, block->used_length); > } > rcu_read_unlock(); > qemu_mutex_unlock(&rs->bitmap_mutex); > -- > 2.9.3 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 9aadc5c..8a1372c 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -354,11 +354,13 @@ static inline void cpu_physical_memory_clear_dirty_range(ram_addr_t start, static inline uint64_t cpu_physical_memory_sync_dirty_bitmap(unsigned long *dest, + RAMBlock *rb, ram_addr_t start, ram_addr_t length, uint64_t *real_dirty_pages) { ram_addr_t addr; + start = rb->offset + start; unsigned long page = BIT_WORD(start >> TARGET_PAGE_BITS); uint64_t num_dirty = 0; diff --git a/migration/ram.c b/migration/ram.c index fe01e7b..3f3842a 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -646,13 +646,13 @@ static inline bool migration_bitmap_clear_dirty(RAMState *rs, ram_addr_t addr) return ret; } -static void migration_bitmap_sync_range(RAMState *rs, ram_addr_t start, - ram_addr_t length) +static void migration_bitmap_sync_range(RAMState *rs, RAMBlock *rb, + ram_addr_t start, ram_addr_t length) { unsigned long *bitmap; bitmap = atomic_rcu_read(&rs->ram_bitmap)->bmap; rs->migration_dirty_pages += - cpu_physical_memory_sync_dirty_bitmap(bitmap, start, length, + cpu_physical_memory_sync_dirty_bitmap(bitmap, rb, start, length, &rs->num_dirty_pages_period); } @@ -699,7 +699,7 @@ static void migration_bitmap_sync(RAMState *rs) qemu_mutex_lock(&rs->bitmap_mutex); rcu_read_lock(); QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { - migration_bitmap_sync_range(rs, block->offset, block->used_length); + migration_bitmap_sync_range(rs, block, 0, block->used_length); } rcu_read_unlock(); qemu_mutex_unlock(&rs->bitmap_mutex);
We change the meaning of start to be the offset from the beggining of the block. Signed-off-by: Juan Quintela <quintela@redhat.com> --- include/exec/ram_addr.h | 2 ++ migration/ram.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-)