[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/15] memory: Pass mr into snapshot_and_clear_di
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v2 07/15] memory: Pass mr into snapshot_and_clear_dirty |
Date: |
Mon, 20 May 2019 11:08:31 +0800 |
Also we change the 2nd parameter of it to be the relative offset
within the memory region. This is to be used in follow up patches.
Signed-off-by: Peter Xu <address@hidden>
---
exec.c | 3 ++-
include/exec/ram_addr.h | 2 +-
memory.c | 3 +--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/exec.c b/exec.c
index 4e734770c2..2615b4cfed 100644
--- a/exec.c
+++ b/exec.c
@@ -1387,9 +1387,10 @@ bool cpu_physical_memory_test_and_clear_dirty(ram_addr_t
start,
}
DirtyBitmapSnapshot *cpu_physical_memory_snapshot_and_clear_dirty
- (ram_addr_t start, ram_addr_t length, unsigned client)
+(MemoryRegion *mr, hwaddr addr, hwaddr length, unsigned client)
{
DirtyMemoryBlocks *blocks;
+ ram_addr_t start = memory_region_get_ram_addr(mr) + addr;
unsigned long align = 1UL << (TARGET_PAGE_BITS + BITS_PER_LEVEL);
ram_addr_t first = QEMU_ALIGN_DOWN(start, align);
ram_addr_t last = QEMU_ALIGN_UP(start + length, align);
diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
index 86bc8e1a4a..69cc528c98 100644
--- a/include/exec/ram_addr.h
+++ b/include/exec/ram_addr.h
@@ -403,7 +403,7 @@ bool cpu_physical_memory_test_and_clear_dirty(ram_addr_t
start,
unsigned client);
DirtyBitmapSnapshot *cpu_physical_memory_snapshot_and_clear_dirty
- (ram_addr_t start, ram_addr_t length, unsigned client);
+(MemoryRegion *mr, ram_addr_t start, hwaddr length, unsigned client);
bool cpu_physical_memory_snapshot_get_dirty(DirtyBitmapSnapshot *snap,
ram_addr_t start,
diff --git a/memory.c b/memory.c
index cff0ea8f40..84bba7b65c 100644
--- a/memory.c
+++ b/memory.c
@@ -2071,8 +2071,7 @@ DirtyBitmapSnapshot
*memory_region_snapshot_and_clear_dirty(MemoryRegion *mr,
{
assert(mr->ram_block);
memory_region_sync_dirty_bitmap(mr);
- return cpu_physical_memory_snapshot_and_clear_dirty(
- memory_region_get_ram_addr(mr) + addr, size, client);
+ return cpu_physical_memory_snapshot_and_clear_dirty(mr, addr, size,
client);
}
bool memory_region_snapshot_get_dirty(MemoryRegion *mr, DirtyBitmapSnapshot
*snap,
--
2.17.1
- [Qemu-devel] [PATCH v2 00/15] kvm/migration: support KVM_CLEAR_DIRTY_LOG, Peter Xu, 2019/05/19
- [Qemu-devel] [PATCH v2 01/15] checkpatch: Allow SPDX-License-Identifier, Peter Xu, 2019/05/19
- [Qemu-devel] [PATCH v2 03/15] migration: No need to take rcu during sync_dirty_bitmap, Peter Xu, 2019/05/19
- [Qemu-devel] [PATCH v2 04/15] memory: Remove memory_region_get_dirty(), Peter Xu, 2019/05/19
- [Qemu-devel] [PATCH v2 05/15] memory: Don't set migration bitmap when without migration, Peter Xu, 2019/05/19
- [Qemu-devel] [PATCH v2 02/15] linux-headers: Update to Linux 5.2-rc1, Peter Xu, 2019/05/19
- [Qemu-devel] [PATCH v2 06/15] bitmap: Add bitmap_copy_with_{src|dst}_offset(), Peter Xu, 2019/05/19
- [Qemu-devel] [PATCH v2 07/15] memory: Pass mr into snapshot_and_clear_dirty,
Peter Xu <=
- [Qemu-devel] [PATCH v2 09/15] kvm: Update comments for sync_dirty_bitmap, Peter Xu, 2019/05/19
- [Qemu-devel] [PATCH v2 08/15] memory: Introduce memory listener hook log_clear(), Peter Xu, 2019/05/19
- [Qemu-devel] [PATCH v2 10/15] kvm: Persistent per kvmslot dirty bitmap, Peter Xu, 2019/05/19
- [Qemu-devel] [PATCH v2 11/15] kvm: Introduce slots lock for memory listener, Peter Xu, 2019/05/19
- [Qemu-devel] [PATCH v2 12/15] kvm: Support KVM_CLEAR_DIRTY_LOG, Peter Xu, 2019/05/19
- [Qemu-devel] [PATCH v2 13/15] qmp: Expose manual_dirty_log_protect via "query-kvm", Peter Xu, 2019/05/19