From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59384) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtEOf-0006rf-K7 for qemu-devel@nongnu.org; Wed, 18 Dec 2013 05:30:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VtEOZ-0002bT-HS for qemu-devel@nongnu.org; Wed, 18 Dec 2013 05:30:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48670) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtEOZ-0002bL-7u for qemu-devel@nongnu.org; Wed, 18 Dec 2013 05:30:27 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rBIAUPfW030025 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 18 Dec 2013 05:30:26 -0500 Message-ID: <52B1795C.90307@redhat.com> Date: Wed, 18 Dec 2013 12:30:52 +0200 From: Orit Wasserman MIME-Version: 1.0 References: <1387293974-24718-1-git-send-email-quintela@redhat.com> <1387293974-24718-22-git-send-email-quintela@redhat.com> In-Reply-To: <1387293974-24718-22-git-send-email-quintela@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 21/38] memory: make cpu_physical_memory_get_dirty() the main function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela , qemu-devel@nongnu.org On 12/17/2013 05:25 PM, Juan Quintela wrote: > And make cpu_physical_memory_get_dirty_flag() to use it. It used to > be the other way around. > > Signed-off-by: Juan Quintela > Reviewed-by: Eric Blake > --- > include/exec/memory-internal.h | 36 +++++++++++++++++++----------------- > 1 file changed, 19 insertions(+), 17 deletions(-) > > diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h > index b99617a..edca8a8 100644 > --- a/include/exec/memory-internal.h > +++ b/include/exec/memory-internal.h > @@ -40,11 +40,28 @@ void *qemu_get_ram_ptr(ram_addr_t addr); > void qemu_ram_free(ram_addr_t addr); > void qemu_ram_free_from_ptr(ram_addr_t addr); > > +static inline int cpu_physical_memory_get_dirty(ram_addr_t start, > + ram_addr_t length, > + unsigned client) > +{ > + int ret = 0; > + ram_addr_t addr, end; > + > + assert(client < DIRTY_MEMORY_NUM); > + > + end = TARGET_PAGE_ALIGN(start + length); > + start &= TARGET_PAGE_MASK; > + for (addr = start; addr < end; addr += TARGET_PAGE_SIZE) { > + ret |= test_bit(addr >> TARGET_PAGE_BITS, > + ram_list.dirty_memory[client]); > + } > + return ret; > +} > + > static inline bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr, > unsigned client) > { > - assert(client < DIRTY_MEMORY_NUM); > - return test_bit(addr >> TARGET_PAGE_BITS, ram_list.dirty_memory[client]); > + return cpu_physical_memory_get_dirty(addr, 1, client); > } > > /* read dirty bit (return 0 or 1) */ > @@ -57,21 +74,6 @@ static inline bool cpu_physical_memory_is_dirty(ram_addr_t addr) > return vga && code && migration; > } > > -static inline int cpu_physical_memory_get_dirty(ram_addr_t start, > - ram_addr_t length, > - unsigned client) > -{ > - int ret = 0; > - ram_addr_t addr, end; > - > - end = TARGET_PAGE_ALIGN(start + length); > - start &= TARGET_PAGE_MASK; > - for (addr = start; addr < end; addr += TARGET_PAGE_SIZE) { > - ret |= cpu_physical_memory_get_dirty_flag(addr, client); > - } > - return ret; > -} > - > static inline void cpu_physical_memory_set_dirty_flag(ram_addr_t addr, > unsigned client) > { > Reviewed-by: Orit Wasserman