From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54655) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtE6n-0000Ez-IE for qemu-devel@nongnu.org; Wed, 18 Dec 2013 05:12:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VtE6h-0005Ev-ID for qemu-devel@nongnu.org; Wed, 18 Dec 2013 05:12:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41211) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtE6h-0005Er-AN for qemu-devel@nongnu.org; Wed, 18 Dec 2013 05:11:59 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rBIABwwJ016033 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 18 Dec 2013 05:11:58 -0500 Message-ID: <52B17510.8050904@redhat.com> Date: Wed, 18 Dec 2013 12:12:32 +0200 From: Orit Wasserman MIME-Version: 1.0 References: <1387293974-24718-1-git-send-email-quintela@redhat.com> <1387293974-24718-11-git-send-email-quintela@redhat.com> In-Reply-To: <1387293974-24718-11-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 10/38] memory: cpu_physical_memory_set_dirty_range() always dirty all flags 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: > So remove the flag argument and do it directly. After this change, > there is nothing else using cpu_physical_memory_set_dirty_flags() so > remove it. > > Signed-off-by: Juan Quintela > Reviewed-by: Eric Blake > --- > exec.c | 2 +- > include/exec/memory-internal.h | 11 ++--------- > memory.c | 2 +- > 3 files changed, 4 insertions(+), 11 deletions(-) > > diff --git a/exec.c b/exec.c > index 6981f73..45fdb84 100644 > --- a/exec.c > +++ b/exec.c > @@ -1274,7 +1274,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, > last_ram_offset() >> TARGET_PAGE_BITS); > memset(ram_list.phys_dirty + (new_block->offset >> TARGET_PAGE_BITS), > 0, size >> TARGET_PAGE_BITS); > - cpu_physical_memory_set_dirty_range(new_block->offset, size, 0xff); > + cpu_physical_memory_set_dirty_range(new_block->offset, size); > > qemu_ram_setup_dump(new_block->host, size); > qemu_madvise(new_block->host, size, QEMU_MADV_HUGEPAGE); > diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h > index 9f4ad69..681d63b 100644 > --- a/include/exec/memory-internal.h > +++ b/include/exec/memory-internal.h > @@ -75,12 +75,6 @@ static inline int cpu_physical_memory_get_dirty(ram_addr_t start, > return ret; > } > > -static inline void cpu_physical_memory_set_dirty_flags(ram_addr_t addr, > - int dirty_flags) > -{ > - ram_list.phys_dirty[addr >> TARGET_PAGE_BITS] |= dirty_flags; > -} > - > static inline void cpu_physical_memory_set_dirty_flag(ram_addr_t addr, > int dirty_flag) > { > @@ -103,15 +97,14 @@ static inline int cpu_physical_memory_clear_dirty_flags(ram_addr_t addr, > } > > static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start, > - ram_addr_t length, > - int dirty_flags) > + ram_addr_t length) > { > ram_addr_t addr, end; > > end = TARGET_PAGE_ALIGN(start + length); > start &= TARGET_PAGE_MASK; > for (addr = start; addr < end; addr += TARGET_PAGE_SIZE) { > - cpu_physical_memory_set_dirty_flags(addr, dirty_flags); > + cpu_physical_memory_set_dirty(addr); > } > xen_modified_memory(addr, length); > } > diff --git a/memory.c b/memory.c > index e497f99..fb52e1c 100644 > --- a/memory.c > +++ b/memory.c > @@ -1182,7 +1182,7 @@ void memory_region_set_dirty(MemoryRegion *mr, hwaddr addr, > hwaddr size) > { > assert(mr->terminates); > - cpu_physical_memory_set_dirty_range(mr->ram_addr + addr, size, -1); > + cpu_physical_memory_set_dirty_range(mr->ram_addr + addr, size); > } > > bool memory_region_test_and_clear_dirty(MemoryRegion *mr, hwaddr addr, > Reviewed-by: Orit Wasserman