From nobody Sun May 19 21:29:27 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 1496833213464904.5185320252584; Wed, 7 Jun 2017 04:00:13 -0700 (PDT) Received: from localhost ([::1]:42609 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIYh9-00056a-SR for importer@patchew.org; Wed, 07 Jun 2017 07:00:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIYfL-0004F2-B0 for qemu-devel@nongnu.org; Wed, 07 Jun 2017 06:58:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIYfJ-0001BP-W5 for qemu-devel@nongnu.org; Wed, 07 Jun 2017 06:58:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46938) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dIYfJ-0001Ag-QF for qemu-devel@nongnu.org; Wed, 07 Jun 2017 06:58:17 -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 A2C3180F7C for ; Wed, 7 Jun 2017 10:58:16 +0000 (UTC) Received: from secure.mitica (ovpn-117-154.ams2.redhat.com [10.36.117.154]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5059917512; Wed, 7 Jun 2017 10:58:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A2C3180F7C Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=quintela@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com A2C3180F7C From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 7 Jun 2017 12:58:09 +0200 Message-Id: <20170607105810.3003-2-quintela@redhat.com> In-Reply-To: <20170607105810.3003-1-quintela@redhat.com> References: <20170607105810.3003-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.27]); Wed, 07 Jun 2017 10:58:16 +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 v2 1/2] 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" Once there, create populate_disk_info. Signed-off-by: Juan Quintela -- - create populate_disk_info instead of "abusing" populate_ram_info Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Laurent Vivier Reviewed-by: Peter Xu --- migration/migration.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 4dbc4f2..cfa266b 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -515,6 +515,17 @@ static void populate_ram_info(MigrationInfo *info, Mig= rationState *s) } } =20 +static void populate_disk_info(MigrationInfo *info) +{ + 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(); + } +} + MigrationInfo *qmp_query_migrate(Error **errp) { MigrationInfo *info =3D g_malloc0(sizeof(*info)); @@ -540,15 +551,7 @@ 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(); - } - + populate_disk_info(info); break; case MIGRATION_STATUS_POSTCOPY_ACTIVE: /* Mostly the same as active; TODO add some postcopy stats */ @@ -562,15 +565,7 @@ 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(); - } - + populate_disk_info(info); break; case MIGRATION_STATUS_COLO: info->has_status =3D true; --=20 2.9.4 From nobody Sun May 19 21:29:27 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 1496833279150383.7601679745303; Wed, 7 Jun 2017 04:01:19 -0700 (PDT) Received: from localhost ([::1]:42617 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIYiD-0005id-Ig for importer@patchew.org; Wed, 07 Jun 2017 07:01:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46120) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIYfM-0004FB-Nl for qemu-devel@nongnu.org; Wed, 07 Jun 2017 06:58:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIYfL-0001CF-P8 for qemu-devel@nongnu.org; Wed, 07 Jun 2017 06:58:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41828) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dIYfL-0001Bn-JG for qemu-devel@nongnu.org; Wed, 07 Jun 2017 06:58:19 -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 883F68553D for ; Wed, 7 Jun 2017 10:58:18 +0000 (UTC) Received: from secure.mitica (ovpn-117-154.ams2.redhat.com [10.36.117.154]) by smtp.corp.redhat.com (Postfix) with ESMTP id 00BDA58841; Wed, 7 Jun 2017 10:58:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 883F68553D Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=quintela@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 883F68553D From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 7 Jun 2017 12:58:10 +0200 Message-Id: <20170607105810.3003-3-quintela@redhat.com> In-Reply-To: <20170607105810.3003-1-quintela@redhat.com> References: <20170607105810.3003-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.28]); Wed, 07 Jun 2017 10:58:18 +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 v2 2/2] 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 Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Laurent Vivier Reviewed-by: Peter Xu --- migration/migration.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index cfa266b..b31a195 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -541,20 +541,8 @@ 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); - populate_disk_info(info); - break; case MIGRATION_STATUS_POSTCOPY_ACTIVE: - /* Mostly the same as active; TODO add some postcopy stats */ + /* 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