From nobody Tue Feb 10 13:16:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516018223965461.4575271337808; Mon, 15 Jan 2018 04:10:23 -0800 (PST) Received: from localhost ([::1]:59316 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb3ap-0004Fu-8X for importer@patchew.org; Mon, 15 Jan 2018 07:10:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49918) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb3L3-0007gj-Ax for qemu-devel@nongnu.org; Mon, 15 Jan 2018 06:54:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eb3L2-0003fQ-Gd for qemu-devel@nongnu.org; Mon, 15 Jan 2018 06:54:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50202) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eb3L2-0003ez-AN for qemu-devel@nongnu.org; Mon, 15 Jan 2018 06:54:04 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 66B5B5D68B for ; Mon, 15 Jan 2018 11:54:03 +0000 (UTC) Received: from secure.mitica (ovpn-116-55.ams2.redhat.com [10.36.116.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id CCFC054581; Mon, 15 Jan 2018 11:54:00 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 15 Jan 2018 12:53:00 +0100 Message-Id: <20180115115309.23982-19-quintela@redhat.com> In-Reply-To: <20180115115309.23982-1-quintela@redhat.com> References: <20180115115309.23982-1-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 15 Jan 2018 11:54:03 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 18/27] migration: split use of MigrationState.total_time X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Peter Xu It was used either to: 1. store initial timestamp of migration start, and 2. store total time used by last migration Let's provide two parameters for each of them. Mix use of the two is slightly misleading. Signed-off-by: Peter Xu Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela --- migration/migration.c | 7 ++++--- migration/migration.h | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 0b513c2020..23f6e5092c 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -619,7 +619,7 @@ static void fill_source_migration_info(MigrationInfo *i= nfo) info->has_status =3D true; info->has_total_time =3D true; info->total_time =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME) - - s->total_time; + - s->start_time; info->has_expected_downtime =3D true; info->expected_downtime =3D s->expected_downtime; info->has_setup_time =3D true; @@ -1300,7 +1300,8 @@ MigrationState *migrate_init(void) =20 migrate_set_state(&s->state, MIGRATION_STATUS_NONE, MIGRATION_STATUS_S= ETUP); =20 - s->total_time =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME); + s->start_time =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME); + s->total_time =3D 0; return s; } =20 @@ -2332,7 +2333,7 @@ static void *migration_thread(void *opaque) qemu_mutex_lock_iothread(); if (s->state =3D=3D MIGRATION_STATUS_COMPLETED) { uint64_t transferred_bytes =3D qemu_ftell(s->to_dst_file); - s->total_time =3D end_time - s->total_time; + s->total_time =3D end_time - s->start_time; if (!entered_postcopy) { s->downtime =3D end_time - start_time; } diff --git a/migration/migration.h b/migration/migration.h index d84bc550b1..d1132b1cf7 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -115,6 +115,9 @@ struct MigrationState } rp_state; =20 double mbps; + /* Timestamp when recent migration starts (ms) */ + int64_t start_time; + /* Total time used by latest migration (ms) */ int64_t total_time; int64_t downtime; int64_t expected_downtime; --=20 2.14.3