From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbBkH-0005T9-Cp for qemu-devel@nongnu.org; Thu, 26 Mar 2015 13:39:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YbBkE-0003ZP-1E for qemu-devel@nongnu.org; Thu, 26 Mar 2015 13:39:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23298) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbBkD-0003Z7-QB for qemu-devel@nongnu.org; Thu, 26 Mar 2015 13:39:01 -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 t2QHd0l7002618 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 26 Mar 2015 13:39:01 -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 t2QHcflF025898 for ; Thu, 26 Mar 2015 13:38:59 -0400 From: Paolo Bonzini Date: Thu, 26 Mar 2015 18:38:27 +0100 Message-Id: <1427391520-29497-10-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 09/22] memory: return DIRTY_MEMORY_MIGRATION from memory_region_is_logging List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This will be used to make the setting of bitmaps conditional. Signed-off-by: Paolo Bonzini --- memory.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/memory.c b/memory.c index 3864667..76da05b 100644 --- a/memory.c +++ b/memory.c @@ -1324,7 +1324,11 @@ bool memory_region_is_skip_dump(MemoryRegion *mr) uint8_t memory_region_is_logging(MemoryRegion *mr) { - return mr->dirty_log_mask; + uint8_t mask = mr->dirty_log_mask; + if (global_dirty_log) { + mask |= (1 << DIRTY_MEMORY_MIGRATION); + } + return mask; } bool memory_region_is_rom(MemoryRegion *mr) -- 2.3.3