From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56578) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VswXo-0002Gn-Ng for qemu-devel@nongnu.org; Tue, 17 Dec 2013 10:26:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VswXi-0000rF-Hg for qemu-devel@nongnu.org; Tue, 17 Dec 2013 10:26:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:10834) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VswXi-0000qq-8F for qemu-devel@nongnu.org; Tue, 17 Dec 2013 10:26:42 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rBHFQf2A031034 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 17 Dec 2013 10:26:41 -0500 From: Juan Quintela Date: Tue, 17 Dec 2013 16:25:57 +0100 Message-Id: <1387293974-24718-22-git-send-email-quintela@redhat.com> In-Reply-To: <1387293974-24718-1-git-send-email-quintela@redhat.com> References: <1387293974-24718-1-git-send-email-quintela@redhat.com> Subject: [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: qemu-devel@nongnu.org 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) { -- 1.8.3.1