From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55623) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwVyw-0004pK-Fg for qemu-devel@nongnu.org; Wed, 11 Nov 2015 09:02:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZwVyt-0001TL-Co for qemu-devel@nongnu.org; Wed, 11 Nov 2015 09:02:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59231) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwVyt-0001TG-7Z for qemu-devel@nongnu.org; Wed, 11 Nov 2015 09:02:35 -0500 From: "Dr. David Alan Gilbert (git)" Date: Wed, 11 Nov 2015 14:02:28 +0000 Message-Id: <1447250549-10291-3-git-send-email-dgilbert@redhat.com> In-Reply-To: <1447250549-10291-1-git-send-email-dgilbert@redhat.com> References: <1447250549-10291-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH 2/3] Postcopy: Fix TP!=HP zero case List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, quintela@redhat.com, amit.shah@redhat.com Cc: bharata@linux.vnet.ibm.com From: "Dr. David Alan Gilbert" Where the target page size is different from the host page we special case it, but I messed up on the zero case check. Signed-off-by: Dr. David Alan Gilbert --- migration/ram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/ram.c b/migration/ram.c index 62cf42b..4266687 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2273,6 +2273,7 @@ static int ram_load_postcopy(QEMUFile *f) /* Temporary page that is later 'placed' */ void *postcopy_host_page = postcopy_get_tmp_page(mis); void *last_host = NULL; + bool all_zero = false; while (!ret && !(flags & RAM_SAVE_FLAG_EOS)) { ram_addr_t addr; @@ -2280,7 +2281,6 @@ static int ram_load_postcopy(QEMUFile *f) void *page_buffer = NULL; void *place_source = NULL; uint8_t ch; - bool all_zero = false; addr = qemu_get_be64(f); flags = addr & ~TARGET_PAGE_MASK; -- 2.5.0