From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
kvm@vger.kernel.org, Juan Quintela <quintela@redhat.com>,
Thomas Huth <thuth@redhat.com>,
Richard Henderson <rth@twiddle.net>,
Laurent Vivier <lvivier@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
Peter Xu <peterx@redhat.com>
Subject: [PULL 11/21] memory: Pass mr into snapshot_and_clear_dirty
Date: Mon, 15 Jul 2019 15:51:15 +0200 [thread overview]
Message-ID: <20190715135125.17770-12-quintela@redhat.com> (raw)
In-Reply-To: <20190715135125.17770-1-quintela@redhat.com>
From: Peter Xu <peterx@redhat.com>
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 <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20190603065056.25211-6-peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
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 50ea9c5aaa..3a00698cc0 100644
--- a/exec.c
+++ b/exec.c
@@ -1390,9 +1390,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 offset, hwaddr length, unsigned client)
{
DirtyMemoryBlocks *blocks;
+ ram_addr_t start = memory_region_get_ram_addr(mr) + offset;
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 0a532c3963..1843b6f2d3 100644
--- a/include/exec/ram_addr.h
+++ b/include/exec/ram_addr.h
@@ -404,7 +404,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, hwaddr offset, 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 93486a71d7..71fcaf2d00 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.21.0
next prev parent reply other threads:[~2019-07-15 13:52 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-15 13:51 [PULL 00/21] Migration pull request Juan Quintela
2019-07-15 13:51 ` [PULL 01/21] migration: fix multifd_recv event typo Juan Quintela
2019-07-15 13:51 ` [PULL 02/21] migration-test: rename parameter to parameter_int Juan Quintela
2019-07-15 13:51 ` [PULL 03/21] migration/multifd: call multifd_send_sync_main when sending RAM_SAVE_FLAG_EOS Juan Quintela
2019-07-15 13:51 ` [PULL 04/21] migration/xbzrle: update cache and current_data in one place Juan Quintela
2019-07-15 13:51 ` [PULL 05/21] cutils: remove one unnecessary pointer operation Juan Quintela
2019-07-15 13:51 ` [PULL 06/21] migration/multifd: sync packet_num after all thread are done Juan Quintela
2019-07-15 13:51 ` [PULL 07/21] migration/ram.c: reset complete_round when we gets a queued page Juan Quintela
2019-07-15 13:51 ` [PULL 08/21] migration: No need to take rcu during sync_dirty_bitmap Juan Quintela
2019-07-15 13:51 ` [PULL 09/21] memory: Don't set migration bitmap when without migration Juan Quintela
2019-07-15 13:51 ` [PULL 10/21] bitmap: Add bitmap_copy_with_{src|dst}_offset() Juan Quintela
2019-07-15 13:51 ` Juan Quintela [this message]
2019-07-15 13:51 ` [PULL 12/21] memory: Introduce memory listener hook log_clear() Juan Quintela
2019-07-15 13:51 ` [PULL 13/21] kvm: Update comments for sync_dirty_bitmap Juan Quintela
2019-07-15 13:51 ` [PULL 14/21] kvm: Persistent per kvmslot dirty bitmap Juan Quintela
2019-07-15 13:51 ` [PULL 15/21] kvm: Introduce slots lock for memory listener Juan Quintela
2019-07-15 13:51 ` [PULL 16/21] kvm: Support KVM_CLEAR_DIRTY_LOG Juan Quintela
2019-07-15 13:51 ` [PULL 17/21] migration: Split log_clear() into smaller chunks Juan Quintela
2019-07-15 13:51 ` [PULL 18/21] migration: allow private destination ram with x-ignore-shared Juan Quintela
2019-07-15 13:51 ` [PULL 19/21] migration/postcopy: fix document of postcopy_send_discard_bm_ram() Juan Quintela
2019-07-15 13:51 ` [PULL 20/21] migration/postcopy: remove redundant cpu_synchronize_all_post_init Juan Quintela
2019-07-15 13:51 ` [PULL 21/21] migration: always initial RAMBlock.bmap to 1 for new migration Juan Quintela
2019-07-15 15:11 ` [Qemu-devel] [PULL 00/21] Migration pull request Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190715135125.17770-12-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=dgilbert@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).