[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 42/51] ram: Pass RAMBlock to bitmap_sync
From: |
Yang Hongyang |
Subject: |
Re: [Qemu-devel] [PATCH 42/51] ram: Pass RAMBlock to bitmap_sync |
Date: |
Fri, 24 Mar 2017 09:10:50 +0800 |
User-agent: |
Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 |
On 2017/3/24 4:45, Juan Quintela wrote:
> We change the meaning of start to be the offset from the beggining of
> the block.
>
> Signed-off-by: Juan Quintela <address@hidden>
> ---
> 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 b05dc84..d50c970 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,
> int64_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 064b2c0..9772fd8 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -648,13 +648,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);
> }
>
> @@ -701,7 +701,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);
Since RAMBlock been passed to bitmap_sync, could we remove
param 'block->used_length' either?
> }
> rcu_read_unlock();
> qemu_mutex_unlock(&rs->bitmap_mutex);
>
--
Thanks,
Yang
- Re: [Qemu-devel] [PATCH 39/51] ram: We don't need MigrationState parameter anymore, (continued)
Re: [Qemu-devel] [PATCH 42/51] ram: Pass RAMBlock to bitmap_sync, Dr. David Alan Gilbert, 2017/03/30
[Qemu-devel] [PATCH 45/51] ram: Use page number instead of an address for the bitmap operations, Juan Quintela, 2017/03/23