From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38592) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SlfIM-0005i9-M3 for qemu-devel@nongnu.org; Mon, 02 Jul 2012 08:00:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SlfIG-0008KE-Ab for qemu-devel@nongnu.org; Mon, 02 Jul 2012 07:59:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7670) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SlfIG-0008KA-2d for qemu-devel@nongnu.org; Mon, 02 Jul 2012 07:59:52 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q62Bxpdm029500 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 2 Jul 2012 07:59:51 -0400 Received: from dhcp-1-120.tlv.redhat.com (vpn-200-125.tlv.redhat.com [10.35.200.125]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q62BxogM008571 for ; Mon, 2 Jul 2012 07:59:51 -0400 Message-ID: <4FF18D45.3050108@redhat.com> Date: Mon, 02 Jul 2012 15:00:05 +0300 From: Orit Wasserman MIME-Version: 1.0 References: <07c8945d9b633bc509ebec0ff6646834ec974ccb.1340910651.git.quintela@redhat.com> In-Reply-To: <07c8945d9b633bc509ebec0ff6646834ec974ccb.1340910651.git.quintela@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 09/12] ram: save_live_setup() don't need to sent pages List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org On 06/28/2012 10:22 PM, Juan Quintela wrote: > We should send pages on interate phase, not in setup one. This was a > "bug". Just removing the loop does what we want. Tested that it > works with current ram_load(). > > Signed-off-by: Juan Quintela > --- > arch_init.c | 33 --------------------------------- > 1 file changed, 33 deletions(-) > > diff --git a/arch_init.c b/arch_init.c > index d5d7a78..1eab331 100644 > --- a/arch_init.c > +++ b/arch_init.c > @@ -307,9 +307,6 @@ static int ram_save_setup(QEMUFile *f, void *opaque) > { > ram_addr_t addr; > RAMBlock *block; > - double bwidth = 0; > - int ret; > - int i; > > memory_global_sync_dirty_bitmap(get_system_memory()); > > @@ -338,36 +335,6 @@ static int ram_save_setup(QEMUFile *f, void *opaque) > qemu_put_be64(f, block->length); > } > > - bwidth = qemu_get_clock_ns(rt_clock); > - > - i = 0; > - while ((ret = qemu_file_rate_limit(f)) == 0) { > - int bytes_sent; > - > - bytes_sent = ram_save_block(f); > - bytes_transferred += bytes_sent; > - if (bytes_sent == 0) { /* no more blocks */ > - break; > - } > - /* we want to check in the 1st loop, just in case it was the 1st time > - and we had to sync the dirty bitmap. > - qemu_get_clock_ns() is a bit expensive, so we only check each some > - iterations > - */ > - if ((i & 63) == 0) { > - uint64_t t1 = (qemu_get_clock_ns(rt_clock) - bwidth) / 1000000; > - if (t1 > MAX_WAIT) { > - DPRINTF("big wait: %ld milliseconds, %d iterations\n", t1, i); > - break; > - } > - } > - i++; > - } > - > - if (ret < 0) { > - return ret; > - } > - > qemu_put_be64(f, RAM_SAVE_FLAG_EOS); > > return 0; > Reviewed-by: Orit Wasserman