mirror of https://github.com/proxmox/mirror_qemu
ram_addr: tweaks to xen_modified_memory
Invoke xen_modified_memory from cpu_physical_memory_set_dirty_range_nocode; it is akin to DIRTY_MEMORY_MIGRATION, so set it together with that bitmap. The remaining call from invalidate_and_set_dirty's "else" branch will go away soon. Second, fix the second argument to the function in the cpu_physical_memory_set_dirty_lebitmap call site. That function is only used by KVM, but it is better to be clean anyway. Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Reviewed-by: Fam Zheng <famz@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>master
parent
1bfbac4ee1
commit
49dfcec403
3
exec.c
3
exec.c
|
@ -2281,9 +2281,10 @@ static void invalidate_and_set_dirty(hwaddr addr,
|
||||||
if (cpu_physical_memory_range_includes_clean(addr, length)) {
|
if (cpu_physical_memory_range_includes_clean(addr, length)) {
|
||||||
tb_invalidate_phys_range(addr, addr + length, 0);
|
tb_invalidate_phys_range(addr, addr + length, 0);
|
||||||
cpu_physical_memory_set_dirty_range_nocode(addr, length);
|
cpu_physical_memory_set_dirty_range_nocode(addr, length);
|
||||||
}
|
} else {
|
||||||
xen_modified_memory(addr, length);
|
xen_modified_memory(addr, length);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static int memory_access_size(MemoryRegion *mr, unsigned l, hwaddr addr)
|
static int memory_access_size(MemoryRegion *mr, unsigned l, hwaddr addr)
|
||||||
{
|
{
|
||||||
|
|
|
@ -112,6 +112,7 @@ static inline void cpu_physical_memory_set_dirty_range_nocode(ram_addr_t start,
|
||||||
page = start >> TARGET_PAGE_BITS;
|
page = start >> TARGET_PAGE_BITS;
|
||||||
bitmap_set(ram_list.dirty_memory[DIRTY_MEMORY_MIGRATION], page, end - page);
|
bitmap_set(ram_list.dirty_memory[DIRTY_MEMORY_MIGRATION], page, end - page);
|
||||||
bitmap_set(ram_list.dirty_memory[DIRTY_MEMORY_VGA], page, end - page);
|
bitmap_set(ram_list.dirty_memory[DIRTY_MEMORY_VGA], page, end - page);
|
||||||
|
xen_modified_memory(start, length);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start,
|
static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start,
|
||||||
|
@ -155,7 +156,7 @@ static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
|
||||||
ram_list.dirty_memory[DIRTY_MEMORY_CODE][page + k] |= temp;
|
ram_list.dirty_memory[DIRTY_MEMORY_CODE][page + k] |= temp;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
xen_modified_memory(start, pages);
|
xen_modified_memory(start, pages << TARGET_PAGE_BITS);
|
||||||
} else {
|
} else {
|
||||||
/*
|
/*
|
||||||
* bitmap-traveling is faster than memory-traveling (for addr...)
|
* bitmap-traveling is faster than memory-traveling (for addr...)
|
||||||
|
|
Loading…
Reference in New Issue