From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57576) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGQOZ-0006yo-Td for qemu-devel@nongnu.org; Tue, 25 Sep 2012 04:21:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGQOT-0008Ib-Ml for qemu-devel@nongnu.org; Tue, 25 Sep 2012 04:21:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23281) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGQOT-0008IX-DL for qemu-devel@nongnu.org; Tue, 25 Sep 2012 04:21:25 -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 q8P8LOTo009089 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 25 Sep 2012 04:21:24 -0400 Message-ID: <50616989.9080704@redhat.com> Date: Tue, 25 Sep 2012 10:21:29 +0200 From: Orit Wasserman MIME-Version: 1.0 References: <1348217255-22441-1-git-send-email-quintela@redhat.com> <1348217255-22441-6-git-send-email-quintela@redhat.com> In-Reply-To: <1348217255-22441-6-git-send-email-quintela@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 05/41] migration: rename expected_time to expected_downtime List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org On 09/21/2012 11:46 AM, Juan Quintela wrote: > Signed-off-by: Juan Quintela > --- > arch_init.c | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/arch_init.c b/arch_init.c > index cdd8ab7..013e5e5 100644 > --- a/arch_init.c > +++ b/arch_init.c > @@ -539,7 +539,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) > double bwidth = 0; > int ret; > int i; > - uint64_t expected_time; > + uint64_t expected_downtime; > > bytes_transferred_last = bytes_transferred; > bwidth = qemu_get_clock_ns(rt_clock); > @@ -578,24 +578,24 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) > bwidth = qemu_get_clock_ns(rt_clock) - bwidth; > bwidth = (bytes_transferred - bytes_transferred_last) / bwidth; > > - /* if we haven't transferred anything this round, force expected_time to a > - * a very high value, but without crashing */ > + /* if we haven't transferred anything this round, force > + * expected_downtime to a very high value, but without > + * crashing */ > if (bwidth == 0) { > bwidth = 0.000001; > } > > qemu_put_be64(f, RAM_SAVE_FLAG_EOS); > > - expected_time = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth; > + expected_downtime = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth; > + DPRINTF("ram_save_live: expected(%" PRIu64 ") <= max(" PRIu64 ")?\n", > + expected_downtime, migrate_max_downtime()); > > - DPRINTF("ram_save_live: expected(%" PRIu64 ") <= max(%" PRIu64 ")?\n", > - expected_time, migrate_max_downtime()); > - > - if (expected_time <= migrate_max_downtime()) { > + if (expected_downtime <= migrate_max_downtime()) { > memory_global_sync_dirty_bitmap(get_system_memory()); > - expected_time = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth; > + expected_downtime = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth; > > - return expected_time <= migrate_max_downtime(); > + return expected_downtime <= migrate_max_downtime(); > } > return 0; > } > Reviewed-by: Orit Wasserman