From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40202) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbBkG-0005Qg-2K for qemu-devel@nongnu.org; Thu, 26 Mar 2015 13:39:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YbBkB-0003Yj-Sy for qemu-devel@nongnu.org; Thu, 26 Mar 2015 13:39:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44262) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbBkB-0003YJ-Co for qemu-devel@nongnu.org; Thu, 26 Mar 2015 13:38:59 -0400 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 t2QHcwRC019862 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 26 Mar 2015 13:38:58 -0400 Received: from donizetti.redhat.com (ovpn-112-86.ams2.redhat.com [10.36.112.86]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t2QHcflE025898 for ; Thu, 26 Mar 2015 13:38:57 -0400 From: Paolo Bonzini Date: Thu, 26 Mar 2015 18:38:26 +0100 Message-Id: <1427391520-29497-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1427391520-29497-1-git-send-email-pbonzini@redhat.com> References: <1427391520-29497-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 08/22] memory: track DIRTY_MEMORY_CODE in mr->dirty_log_mask List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org DIRTY_MEMORY_CODE is only needed for TCG. Signed-off-by: Paolo Bonzini --- include/exec/memory.h | 1 - memory.c | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 8d5feb2..aa46a52 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -570,7 +570,6 @@ const char *memory_region_name(const MemoryRegion *mr); * memory_region_is_logging: return whether a memory region is logging writes * * Returns a bitmap of clients for which the memory region is logging writes. - * Right now this will be either 0 or (1 << DIRTY_MEMORY_VGA). * * @mr: the memory region being queried */ diff --git a/memory.c b/memory.c index 45606bc..3864667 100644 --- a/memory.c +++ b/memory.c @@ -1136,6 +1136,7 @@ void memory_region_init_ram(MemoryRegion *mr, mr->terminates = true; mr->destructor = memory_region_destructor_ram; mr->ram_addr = qemu_ram_alloc(size, mr, errp); + mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; } void memory_region_init_resizeable_ram(MemoryRegion *mr, @@ -1153,6 +1154,7 @@ void memory_region_init_resizeable_ram(MemoryRegion *mr, mr->terminates = true; mr->destructor = memory_region_destructor_ram; mr->ram_addr = qemu_ram_alloc_resizeable(size, max_size, resized, mr, errp); + mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; } #ifdef __linux__ @@ -1169,6 +1171,7 @@ void memory_region_init_ram_from_file(MemoryRegion *mr, mr->terminates = true; mr->destructor = memory_region_destructor_ram; mr->ram_addr = qemu_ram_alloc_from_file(size, mr, share, path, errp); + mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; } #endif @@ -1182,6 +1185,7 @@ void memory_region_init_ram_ptr(MemoryRegion *mr, mr->ram = true; mr->terminates = true; mr->destructor = memory_region_destructor_ram_from_ptr; + mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; /* qemu_ram_alloc_from_ptr cannot fail with ptr != NULL. */ assert(ptr != NULL); -- 2.3.3