From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34393) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YmlvO-0001vU-R6 for qemu-devel@nongnu.org; Mon, 27 Apr 2015 12:30:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YmlvM-0002z2-7z for qemu-devel@nongnu.org; Mon, 27 Apr 2015 12:30:26 -0400 Received: from mail-wi0-x234.google.com ([2a00:1450:400c:c05::234]:38136) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YmlvM-0002yq-2R for qemu-devel@nongnu.org; Mon, 27 Apr 2015 12:30:24 -0400 Received: by wiun10 with SMTP id n10so96513514wiu.1 for ; Mon, 27 Apr 2015 09:30:23 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 27 Apr 2015 18:28:17 +0200 Message-Id: <1430152117-100558-10-git-send-email-pbonzini@redhat.com> In-Reply-To: <1430152117-100558-1-git-send-email-pbonzini@redhat.com> References: <1430152117-100558-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 09/29] 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 Cc: famz@redhat.com, stefanha@redhat.com, mst@redhat.com DIRTY_MEMORY_CODE is only needed for TCG. By adding it directly to mr->dirty_log_mask, we avoid testing for TCG everywhere a region is checked for the enabled/disabled state of dirty logging. 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 cfdf39a..b4584e5 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -584,7 +584,6 @@ bool memory_region_is_logging(MemoryRegion *mr, uint8_t client); * 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 3d34f48..1966347 100644 --- a/memory.c +++ b/memory.c @@ -1141,6 +1141,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, @@ -1158,6 +1159,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__ @@ -1174,6 +1176,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 @@ -1187,6 +1190,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); -- 1.8.3.1