From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44910) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ybw3E-0007G2-AA for qemu-devel@nongnu.org; Sat, 28 Mar 2015 15:05:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ybw3A-0002v8-83 for qemu-devel@nongnu.org; Sat, 28 Mar 2015 15:05:44 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:32316) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ybw3A-0002uu-33 for qemu-devel@nongnu.org; Sat, 28 Mar 2015 15:05:40 -0400 Date: Sat, 28 Mar 2015 19:04:22 +0000 From: Stefano Stabellini In-Reply-To: <1427391520-29497-11-git-send-email-pbonzini@redhat.com> Message-ID: References: <1427391520-29497-1-git-send-email-pbonzini@redhat.com> <1427391520-29497-11-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Subject: Re: [Qemu-devel] [PATCH 10/22] ram_addr: tweaks to xen_modified_memory List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org On Thu, 26 Mar 2015, Paolo Bonzini wrote: > 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. > > Signed-off-by: Paolo Bonzini Acked-by: Stefano Stabellini > exec.c | 3 ++- > include/exec/ram_addr.h | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/exec.c b/exec.c > index 8eb73fd..ffa57dd 100644 > --- a/exec.c > +++ b/exec.c > @@ -2261,8 +2261,9 @@ static void invalidate_and_set_dirty(hwaddr addr, > if (cpu_physical_memory_range_includes_clean(addr, length)) { > tb_invalidate_phys_range(addr, addr + length, 0); > 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) > diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h > index ff558a4..7f6e928 100644 > --- a/include/exec/ram_addr.h > +++ b/include/exec/ram_addr.h > @@ -112,6 +112,7 @@ static inline void cpu_physical_memory_set_dirty_range_nocode(ram_addr_t start, > 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_VGA], page, end - page); > + xen_modified_memory(start, length); > } > > 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; > } > } > - xen_modified_memory(start, pages); > + xen_modified_memory(start, pages << TARGET_PAGE_BITS); > } else { > /* > * bitmap-traveling is faster than memory-traveling (for addr...) > -- > 2.3.3 > > >