From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34548) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmxY9-0003jP-3L for qemu-devel@nongnu.org; Wed, 12 Jun 2013 22:46:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UmxY7-0004AC-Ll for qemu-devel@nongnu.org; Wed, 12 Jun 2013 22:46:09 -0400 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:34662) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmxY6-00049h-RZ for qemu-devel@nongnu.org; Wed, 12 Jun 2013 22:46:07 -0400 Received: from /spool/local by e28smtp04.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 13 Jun 2013 08:10:12 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 77F36E0043 for ; Thu, 13 Jun 2013 08:15:20 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5D2k2NE18612362 for ; Thu, 13 Jun 2013 08:16:02 +0530 Received: from d28av02.in.ibm.com (loopback [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r5D2jx2a013580 for ; Thu, 13 Jun 2013 12:46:00 +1000 Message-ID: <51B93261.5030309@linux.vnet.ibm.com> Date: Thu, 13 Jun 2013 10:45:53 +0800 From: Wenchao Xia MIME-Version: 1.0 References: <1370859260-8183-1-git-send-email-pl@kamp.de> <1370859260-8183-2-git-send-email-pl@kamp.de> In-Reply-To: <1370859260-8183-2-git-send-email-pl@kamp.de> Content-Type: text/plain; charset=GB2312 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCHv2 1/2] Revert "migration: do not sent zero pages in bulk stage" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Lieven Cc: quintela@redhat.com, aik@ozlabs.ru, qemu-devel@nongnu.org, owasserm@redhat.com, pbonzini@redhat.com, david@gibson.dropbear.id.au clear patch, I don't see any issue. Reviewed-by: Wenchao Xia > Not sending zero pages breaks migration if a page is zero > at the source but not at the destination. This can e.g. happen > if different BIOS versions are used at source and destination. > It has also been reported that migration on pseries is completely > broken with this patch. > > This effectively reverts commit f1c72795af573b24a7da5eb52375c9aba8a37972. > > Conflicts: > > arch_init.c > > Signed-off-by: Peter Lieven > --- > arch_init.c | 13 ++++--------- > 1 file changed, 4 insertions(+), 9 deletions(-) > > diff --git a/arch_init.c b/arch_init.c > index 5d32ecf..08fccf6 100644 > --- a/arch_init.c > +++ b/arch_init.c > @@ -457,15 +457,10 @@ static int ram_save_block(QEMUFile *f, bool last_stage) > bytes_sent = -1; > if (is_zero_page(p)) { > acct_info.dup_pages++; > - if (!ram_bulk_stage) { > - bytes_sent = save_block_hdr(f, block, offset, cont, > - RAM_SAVE_FLAG_COMPRESS); > - qemu_put_byte(f, 0); > - bytes_sent++; > - } else { > - acct_info.skipped_pages++; > - bytes_sent = 0; > - } > + bytes_sent = save_block_hdr(f, block, offset, cont, > + RAM_SAVE_FLAG_COMPRESS); > + qemu_put_byte(f, 0); > + bytes_sent++; > } else if (!ram_bulk_stage && migrate_use_xbzrle()) { > current_addr = block->offset + offset; > bytes_sent = save_xbzrle_page(f, p, current_addr, block, > -- Best Regards Wenchao Xia