From patchwork Tue Nov 23 23:03:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 72772 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0AADCB70AF for ; Wed, 24 Nov 2010 10:10:05 +1100 (EST) Received: from localhost ([127.0.0.1]:46117 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PL1zt-0004Fg-SC for incoming@patchwork.ozlabs.org; Tue, 23 Nov 2010 18:10:01 -0500 Received: from [140.186.70.92] (port=48785 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PL1ti-0001Ir-HV for qemu-devel@nongnu.org; Tue, 23 Nov 2010 18:03:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PL1tU-0000sl-Il for qemu-devel@nongnu.org; Tue, 23 Nov 2010 18:03:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:64735) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PL1tU-0000sa-A7 for qemu-devel@nongnu.org; Tue, 23 Nov 2010 18:03:24 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oANN3NfB005634 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 23 Nov 2010 18:03:23 -0500 Received: from trasno.mitica (ovpn-113-23.phx2.redhat.com [10.3.113.23]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oANN3D5a025161; Tue, 23 Nov 2010 18:03:22 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 24 Nov 2010 00:03:03 +0100 Message-Id: <79f1daa9190b15d4878f86289ed44d630272d851.1290552026.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Juan Quintela Subject: [Qemu-devel] [PATCH 06/10] Only calculate expected_time for stage 2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Juan Quintela Signed-off-by: Juan Quintela Signed-off-by: Juan Quintela Reviewed-by: Anthony Liguori --- arch_init.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/arch_init.c b/arch_init.c index 4486925..df3d91f 100644 --- a/arch_init.c +++ b/arch_init.c @@ -217,7 +217,6 @@ int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) ram_addr_t addr; uint64_t bytes_transferred_last; double bwidth = 0; - uint64_t expected_time = 0; if (stage < 0) { cpu_physical_memory_set_dirty_tracking(0); @@ -293,9 +292,12 @@ int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) qemu_put_be64(f, RAM_SAVE_FLAG_EOS); - expected_time = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth; - - return (stage == 2) && (expected_time <= migrate_max_downtime()); + if (stage == 2) { + uint64_t expected_time; + expected_time = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth; + return expected_time <= migrate_max_downtime(); + } + return 0; } static inline void *host_from_stream_offset(QEMUFile *f,