From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46839) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwvXu-0006D7-MI for qemu-devel@nongnu.org; Thu, 12 Nov 2015 12:20:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZwvXu-0005i5-1P for qemu-devel@nongnu.org; Thu, 12 Nov 2015 12:20:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35161) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwvXt-0005hq-T0 for qemu-devel@nongnu.org; Thu, 12 Nov 2015 12:20:25 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 64705ABB2C for ; Thu, 12 Nov 2015 17:20:25 +0000 (UTC) From: Juan Quintela Date: Thu, 12 Nov 2015 18:20:14 +0100 Message-Id: <1447348816-17152-5-git-send-email-quintela@redhat.com> In-Reply-To: <1447348816-17152-1-git-send-email-quintela@redhat.com> References: <1447348816-17152-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PULL 4/6] Postcopy: Fix TP!=HP zero case List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com, dgilbert@redhat.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 Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela --- migration/ram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/ram.c b/migration/ram.c index d8d5a50..7f32696 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2274,6 +2274,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; @@ -2281,7 +2282,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