From nobody Tue Nov 11 21:05:57 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565887173; cv=none; d=zoho.com; s=zohoarc; b=ArprQod8IucyxUdzFTR1MSdkSUsXoPRBPMGnjwUsWzt1rIXfVq1jgdmrbRoxFLRbXXhYgy1bi1hzu8UEnaFQLj30mAzk1UoFMuDyQsnGxHrh/5a3+d4o8am8jKxkz6jLgACMEiBvekZ1f609ZzMpXcAowGFfCkp4Ua20KI1z+Hc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565887173; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=0Fxn6S1x5BiS8NaIxvjy0BIbfJe6GGb/DXu9/Iq+5CY=; b=F1MKTzUkSkKLUS/rCVZFurcVMW4R3+e+iWxyN9kR0XfB2cRf31dx1aQG9aoRCmAVFxPbYcnYrG9DwQU0j3WwJiOP4Ea1KkOLLf/T7BRZmJt6cik/8QEVqMyvZKfulpwbQ4m4+gCfrmLK5pq4cBNh6igGzz/2pY8pg0sD3pKIXqk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565887173123878.1519325886943; Thu, 15 Aug 2019 09:39:33 -0700 (PDT) Received: from localhost ([::1]:44328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyImh-0006Tl-Aj for importer@patchew.org; Thu, 15 Aug 2019 12:39:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47132) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyIii-0001L7-Pj for qemu-devel@nongnu.org; Thu, 15 Aug 2019 12:35:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hyIid-00026u-Qd for qemu-devel@nongnu.org; Thu, 15 Aug 2019 12:35:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51066) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hyIid-00026W-Ge for qemu-devel@nongnu.org; Thu, 15 Aug 2019 12:35:19 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C8D448E37A; Thu, 15 Aug 2019 16:35:18 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-19.ams2.redhat.com [10.36.117.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 50B5A60F8C; Thu, 15 Aug 2019 16:35:17 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org Date: Thu, 15 Aug 2019 17:34:34 +0100 Message-Id: <20190815163504.18937-4-dgilbert@redhat.com> In-Reply-To: <20190815163504.18937-1-dgilbert@redhat.com> References: <20190815163504.18937-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 15 Aug 2019 16:35:18 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 03/33] migration: consolidate time info into populate_time_info X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: quintela@redhat.com, yury-kotov@yandex-team.ru, richardw.yang@linux.intel.com, marcandre.lureau@redhat.com, ivanren@tencent.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Wei Yang Consolidate time information fill up into its function for better readability. Signed-off-by: Wei Yang Message-Id: <20190716005411.4156-1-richardw.yang@linux.intel.com> Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Dr. David Alan Gilbert --- migration/migration.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 28342969ea..7c66da3a83 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -823,6 +823,25 @@ bool migration_is_setup_or_active(int state) } } =20 +static void populate_time_info(MigrationInfo *info, MigrationState *s) +{ + info->has_status =3D true; + info->has_setup_time =3D true; + info->setup_time =3D s->setup_time; + if (s->state =3D=3D MIGRATION_STATUS_COMPLETED) { + info->has_total_time =3D true; + info->total_time =3D s->total_time; + info->has_downtime =3D true; + info->downtime =3D s->downtime; + } else { + info->has_total_time =3D true; + info->total_time =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME) - + s->start_time; + info->has_expected_downtime =3D true; + info->expected_downtime =3D s->expected_downtime; + } +} + static void populate_ram_info(MigrationInfo *info, MigrationState *s) { info->has_ram =3D true; @@ -908,16 +927,8 @@ static void fill_source_migration_info(MigrationInfo *= info) case MIGRATION_STATUS_DEVICE: case MIGRATION_STATUS_POSTCOPY_PAUSED: case MIGRATION_STATUS_POSTCOPY_RECOVER: - /* TODO add some postcopy stats */ - info->has_status =3D true; - info->has_total_time =3D true; - info->total_time =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME) - - s->start_time; - info->has_expected_downtime =3D true; - info->expected_downtime =3D s->expected_downtime; - info->has_setup_time =3D true; - info->setup_time =3D s->setup_time; - + /* TODO add some postcopy stats */ + populate_time_info(info, s); populate_ram_info(info, s); populate_disk_info(info); break; @@ -926,14 +937,7 @@ static void fill_source_migration_info(MigrationInfo *= info) /* TODO: display COLO specific information (checkpoint info etc.) = */ break; case MIGRATION_STATUS_COMPLETED: - info->has_status =3D true; - info->has_total_time =3D true; - info->total_time =3D s->total_time; - info->has_downtime =3D true; - info->downtime =3D s->downtime; - info->has_setup_time =3D true; - info->setup_time =3D s->setup_time; - + populate_time_info(info, s); populate_ram_info(info, s); break; case MIGRATION_STATUS_FAILED: --=20 2.21.0