From nobody Sun May 5 10:52:23 2024 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=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1563238500; cv=none; d=zoho.com; s=zohoarc; b=laBkwhq8o7ZkP72X1haXznuPwgvmvaMtM617DW3iY6UPaIjL0CGt+tvdi4IWaBdYN/yQXW5iJ6Xb6bpInMJKgiNorG1SA2G0HsrU7rHGjl6aCneO/TQ5PFQYAfKVMF2PU4McODy8cfd9dtVi1ag61+iH9U6BH442ibETCve77dQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563238500; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=v149coEVII+kw65Tc5Lvu0rFfsD0P9gfxLPv+sUKD5Y=; b=WV0/AMg4uC8B5tQRG4Aa8kxQkXiLBSUZIS8lc6Q84XSCI5gxkBDcmx90oxM7eda3Hxa/GJ9gcYmrEikFhVoJwDlyium215wyOrJw4eqTkfG6h9u3lFCi/w5RU6SCYgzOLBavmzuFAyN6bfXnaMFXkBThXNkkBM9jHbBJJguZ7jM= 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563238500005687.5863290878943; Mon, 15 Jul 2019 17:55:00 -0700 (PDT) Received: from localhost ([::1]:44656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnBk5-0005yH-GD for importer@patchew.org; Mon, 15 Jul 2019 20:54:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54008) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnBjv-0005Xe-BH for qemu-devel@nongnu.org; Mon, 15 Jul 2019 20:54:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnBju-0007hq-1l for qemu-devel@nongnu.org; Mon, 15 Jul 2019 20:54:43 -0400 Received: from mga09.intel.com ([134.134.136.24]:27652) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hnBjt-0007e1-Od for qemu-devel@nongnu.org; Mon, 15 Jul 2019 20:54:41 -0400 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Jul 2019 17:54:39 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by fmsmga008.fm.intel.com with ESMTP; 15 Jul 2019 17:54:38 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,494,1557212400"; d="scan'208";a="167494647" From: Wei Yang To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2019 08:54:11 +0800 Message-Id: <20190716005411.4156-1-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.17.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.24 Subject: [Qemu-devel] [PATCH] 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: Wei Yang , dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Consolidate time information fill up into its function for better readability. Signed-off-by: Wei Yang Reviewed-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 47fe22d327..18ef933105 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -822,6 +822,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; @@ -907,16 +926,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; @@ -925,14 +936,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.17.1