From nobody Tue May 7 22:48:25 2024 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.zoho.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 1496353339402546.6917614539959; Thu, 1 Jun 2017 14:42:19 -0700 (PDT) Received: from localhost ([::1]:46767 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGXrF-0008Mu-M6 for importer@patchew.org; Thu, 01 Jun 2017 17:42:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37302) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGXq7-0007oL-9c for qemu-devel@nongnu.org; Thu, 01 Jun 2017 17:41:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dGXq3-0006Zn-S0 for qemu-devel@nongnu.org; Thu, 01 Jun 2017 17:41:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51568) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dGXq3-0006Z6-J9 for qemu-devel@nongnu.org; Thu, 01 Jun 2017 17:41:03 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 554F47E9C0 for ; Thu, 1 Jun 2017 21:41:02 +0000 (UTC) Received: from secure.mitica (ovpn-117-3.ams2.redhat.com [10.36.117.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id ED9D917111; Thu, 1 Jun 2017 21:41:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 554F47E9C0 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=quintela@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 554F47E9C0 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 1 Jun 2017 23:40:53 +0200 Message-Id: <20170601214056.30387-2-quintela@redhat.com> In-Reply-To: <20170601214056.30387-1-quintela@redhat.com> References: <20170601214056.30387-1-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 01 Jun 2017 21:41:02 +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] [PATCH 1/4] ram: Unfold get_xbzrle_cache_stats() into populate_ram_info() 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" They were called consequtiveley always. Signed-off-by: Juan Quintela Reviewed-by: Eric Blake --- migration/migration.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 60da9d6..fd8b406 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -476,20 +476,6 @@ static bool migration_is_setup_or_active(int state) } } =20 -static void get_xbzrle_cache_stats(MigrationInfo *info) -{ - if (migrate_use_xbzrle()) { - info->has_xbzrle_cache =3D true; - info->xbzrle_cache =3D g_malloc0(sizeof(*info->xbzrle_cache)); - info->xbzrle_cache->cache_size =3D migrate_xbzrle_cache_size(); - info->xbzrle_cache->bytes =3D xbzrle_mig_bytes_transferred(); - info->xbzrle_cache->pages =3D xbzrle_mig_pages_transferred(); - info->xbzrle_cache->cache_miss =3D xbzrle_mig_pages_cache_miss(); - info->xbzrle_cache->cache_miss_rate =3D xbzrle_mig_cache_miss_rate= (); - info->xbzrle_cache->overflow =3D xbzrle_mig_pages_overflow(); - } -} - static void populate_ram_info(MigrationInfo *info, MigrationState *s) { info->has_ram =3D true; @@ -507,6 +493,17 @@ static void populate_ram_info(MigrationInfo *info, Mig= rationState *s) info->ram->postcopy_requests =3D ram_postcopy_requests(); info->ram->page_size =3D qemu_target_page_size(); =20 + if (migrate_use_xbzrle()) { + info->has_xbzrle_cache =3D true; + info->xbzrle_cache =3D g_malloc0(sizeof(*info->xbzrle_cache)); + info->xbzrle_cache->cache_size =3D migrate_xbzrle_cache_size(); + info->xbzrle_cache->bytes =3D xbzrle_mig_bytes_transferred(); + info->xbzrle_cache->pages =3D xbzrle_mig_pages_transferred(); + info->xbzrle_cache->cache_miss =3D xbzrle_mig_pages_cache_miss(); + info->xbzrle_cache->cache_miss_rate =3D xbzrle_mig_cache_miss_rate= (); + info->xbzrle_cache->overflow =3D xbzrle_mig_pages_overflow(); + } + if (s->state !=3D MIGRATION_STATUS_COMPLETED) { info->ram->remaining =3D ram_bytes_remaining(); info->ram->dirty_pages_rate =3D ram_dirty_pages_rate(); @@ -552,7 +549,6 @@ MigrationInfo *qmp_query_migrate(Error **errp) info->cpu_throttle_percentage =3D cpu_throttle_get_percentage(= ); } =20 - get_xbzrle_cache_stats(info); break; case MIGRATION_STATUS_POSTCOPY_ACTIVE: /* Mostly the same as active; TODO add some postcopy stats */ @@ -575,15 +571,12 @@ MigrationInfo *qmp_query_migrate(Error **errp) info->disk->total =3D blk_mig_bytes_total(); } =20 - get_xbzrle_cache_stats(info); break; case MIGRATION_STATUS_COLO: info->has_status =3D true; /* TODO: display COLO specific information (checkpoint info etc.) = */ break; case MIGRATION_STATUS_COMPLETED: - get_xbzrle_cache_stats(info); - info->has_status =3D true; info->has_total_time =3D true; info->total_time =3D s->total_time; --=20 2.9.4 From nobody Tue May 7 22:48:25 2024 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.zoho.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 14963534431391018.597295246417; Thu, 1 Jun 2017 14:44:03 -0700 (PDT) Received: from localhost ([::1]:46772 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGXsv-0001YX-Ow for importer@patchew.org; Thu, 01 Jun 2017 17:44:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37303) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGXq7-0007oM-9e for qemu-devel@nongnu.org; Thu, 01 Jun 2017 17:41:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dGXq5-0006ae-I4 for qemu-devel@nongnu.org; Thu, 01 Jun 2017 17:41:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44164) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dGXq5-0006aR-5U for qemu-devel@nongnu.org; Thu, 01 Jun 2017 17:41:05 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2B7ABC057EC9 for ; Thu, 1 Jun 2017 21:41:04 +0000 (UTC) Received: from secure.mitica (ovpn-117-3.ams2.redhat.com [10.36.117.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id A7155171AB; Thu, 1 Jun 2017 21:41:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 2B7ABC057EC9 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=quintela@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 2B7ABC057EC9 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 1 Jun 2017 23:40:54 +0200 Message-Id: <20170601214056.30387-3-quintela@redhat.com> In-Reply-To: <20170601214056.30387-1-quintela@redhat.com> References: <20170601214056.30387-1-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 01 Jun 2017 21:41:04 +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] [PATCH 2/4] ram: We only print throttling information sometimes 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" Change it to be consistent with everything else. Signed-off-by: Juan Quintela Reviewed-by: Eric Blake --- migration/migration.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index fd8b406..7f79da0 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -504,6 +504,11 @@ static void populate_ram_info(MigrationInfo *info, Mig= rationState *s) info->xbzrle_cache->overflow =3D xbzrle_mig_pages_overflow(); } =20 + if (cpu_throttle_active()) { + info->has_cpu_throttle_percentage =3D true; + info->cpu_throttle_percentage =3D cpu_throttle_get_percentage(); + } + if (s->state !=3D MIGRATION_STATUS_COMPLETED) { info->ram->remaining =3D ram_bytes_remaining(); info->ram->dirty_pages_rate =3D ram_dirty_pages_rate(); @@ -544,11 +549,6 @@ MigrationInfo *qmp_query_migrate(Error **errp) info->disk->total =3D blk_mig_bytes_total(); } =20 - if (cpu_throttle_active()) { - info->has_cpu_throttle_percentage =3D true; - info->cpu_throttle_percentage =3D cpu_throttle_get_percentage(= ); - } - break; case MIGRATION_STATUS_POSTCOPY_ACTIVE: /* Mostly the same as active; TODO add some postcopy stats */ --=20 2.9.4 From nobody Tue May 7 22:48:25 2024 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.zoho.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 1496353438311428.4789521811289; Thu, 1 Jun 2017 14:43:58 -0700 (PDT) Received: from localhost ([::1]:46771 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGXsq-0001Tz-R8 for importer@patchew.org; Thu, 01 Jun 2017 17:43:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37326) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGXq8-0007oN-34 for qemu-devel@nongnu.org; Thu, 01 Jun 2017 17:41:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dGXq7-0006bO-8n for qemu-devel@nongnu.org; Thu, 01 Jun 2017 17:41:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44194) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dGXq7-0006b1-2R for qemu-devel@nongnu.org; Thu, 01 Jun 2017 17:41:07 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 08717C057FA8 for ; Thu, 1 Jun 2017 21:41:06 +0000 (UTC) Received: from secure.mitica (ovpn-117-3.ams2.redhat.com [10.36.117.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E8A0171AB; Thu, 1 Jun 2017 21:41:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 08717C057FA8 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=quintela@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 08717C057FA8 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 1 Jun 2017 23:40:55 +0200 Message-Id: <20170601214056.30387-4-quintela@redhat.com> In-Reply-To: <20170601214056.30387-1-quintela@redhat.com> References: <20170601214056.30387-1-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 01 Jun 2017 21:41:06 +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] [PATCH 3/4] ram: Print block stats also in the complete case 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" To make things easier, I just moved it to populate_ram_info(). Signed-off-by: Juan Quintela Reviewed-by: Eric Blake --- migration/migration.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 7f79da0..8289544 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -509,6 +509,14 @@ static void populate_ram_info(MigrationInfo *info, Mig= rationState *s) info->cpu_throttle_percentage =3D cpu_throttle_get_percentage(); } =20 + if (blk_mig_active()) { + info->has_disk =3D true; + info->disk =3D g_malloc0(sizeof(*info->disk)); + info->disk->transferred =3D blk_mig_bytes_transferred(); + info->disk->remaining =3D blk_mig_bytes_remaining(); + info->disk->total =3D blk_mig_bytes_total(); + } + if (s->state !=3D MIGRATION_STATUS_COMPLETED) { info->ram->remaining =3D ram_bytes_remaining(); info->ram->dirty_pages_rate =3D ram_dirty_pages_rate(); @@ -540,15 +548,6 @@ MigrationInfo *qmp_query_migrate(Error **errp) info->setup_time =3D s->setup_time; =20 populate_ram_info(info, s); - - if (blk_mig_active()) { - info->has_disk =3D true; - info->disk =3D g_malloc0(sizeof(*info->disk)); - info->disk->transferred =3D blk_mig_bytes_transferred(); - info->disk->remaining =3D blk_mig_bytes_remaining(); - info->disk->total =3D blk_mig_bytes_total(); - } - break; case MIGRATION_STATUS_POSTCOPY_ACTIVE: /* Mostly the same as active; TODO add some postcopy stats */ @@ -562,15 +561,6 @@ MigrationInfo *qmp_query_migrate(Error **errp) info->setup_time =3D s->setup_time; =20 populate_ram_info(info, s); - - if (blk_mig_active()) { - info->has_disk =3D true; - info->disk =3D g_malloc0(sizeof(*info->disk)); - info->disk->transferred =3D blk_mig_bytes_transferred(); - info->disk->remaining =3D blk_mig_bytes_remaining(); - info->disk->total =3D blk_mig_bytes_total(); - } - break; case MIGRATION_STATUS_COLO: info->has_status =3D true; --=20 2.9.4 From nobody Tue May 7 22:48:25 2024 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.zoho.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 1496353514262710.9438375145595; Thu, 1 Jun 2017 14:45:14 -0700 (PDT) Received: from localhost ([::1]:46777 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGXu5-0002JT-2O for importer@patchew.org; Thu, 01 Jun 2017 17:45:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGXq9-0007op-LE for qemu-devel@nongnu.org; Thu, 01 Jun 2017 17:41:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dGXq8-0006ci-Up for qemu-devel@nongnu.org; Thu, 01 Jun 2017 17:41:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55306) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dGXq8-0006cD-O1 for qemu-devel@nongnu.org; Thu, 01 Jun 2017 17:41:08 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AAA5347CB for ; Thu, 1 Jun 2017 21:41:07 +0000 (UTC) Received: from secure.mitica (ovpn-117-3.ams2.redhat.com [10.36.117.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5890117111; Thu, 1 Jun 2017 21:41:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com AAA5347CB Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=quintela@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com AAA5347CB From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 1 Jun 2017 23:40:56 +0200 Message-Id: <20170601214056.30387-5-quintela@redhat.com> In-Reply-To: <20170601214056.30387-1-quintela@redhat.com> References: <20170601214056.30387-1-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 01 Jun 2017 21:41:07 +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] [PATCH 4/4] ram: Now POSTCOPY_ACTIVE is the same that STATUS_ACTIVE 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" Merge them. Signed-off-by: Juan Quintela Reviewed-by: Eric Blake --- migration/migration.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 8289544..af4c2cc 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -538,19 +538,7 @@ MigrationInfo *qmp_query_migrate(Error **errp) break; case MIGRATION_STATUS_ACTIVE: case MIGRATION_STATUS_CANCELLING: - 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; - 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; - - populate_ram_info(info, s); - break; case MIGRATION_STATUS_POSTCOPY_ACTIVE: - /* Mostly the same as active; 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) --=20 2.9.4