From patchwork Mon Aug 13 10:50:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 176915 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E80DF2C0089 for ; Mon, 13 Aug 2012 21:11:05 +1000 (EST) Received: from localhost ([::1]:57241 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T0sG2-0004b0-N7 for incoming@patchwork.ozlabs.org; Mon, 13 Aug 2012 06:52:26 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58609) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T0sEs-0001bS-C0 for qemu-devel@nongnu.org; Mon, 13 Aug 2012 06:51:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T0sEq-0003Ge-8a for qemu-devel@nongnu.org; Mon, 13 Aug 2012 06:51:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41061) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T0sEp-0003GP-Vs for qemu-devel@nongnu.org; Mon, 13 Aug 2012 06:51:12 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7DApBdn001512 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 13 Aug 2012 06:51:11 -0400 Received: from trasno.mitica (ovpn-116-54.ams2.redhat.com [10.36.116.54]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q7DAowcP014566; Mon, 13 Aug 2012 06:51:10 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 13 Aug 2012 12:50:57 +0200 Message-Id: <1344855057-32509-8-git-send-email-quintela@redhat.com> In-Reply-To: <1344855057-32509-1-git-send-email-quintela@redhat.com> References: <1344855057-32509-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: eblake@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 7/7] migration: Add dirty_pages_rate to query migrate output X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org For now this is a placeholder, real info will appear once the bitmap changes in the migration thread series is integrated. Signed-off-by: Juan Quintela --- hmp.c | 4 ++++ migration.c | 2 ++ migration.h | 1 + qapi-schema.json | 6 +++++- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/hmp.c b/hmp.c index fc75ec3..dd40631 100644 --- a/hmp.c +++ b/hmp.c @@ -174,6 +174,10 @@ void hmp_info_migrate(Monitor *mon) info->ram->normal); monitor_printf(mon, "normal bytes: %" PRIu64 " kbytes\n", info->ram->normal_bytes >> 10); + if (info->ram->dirty_pages_rate) { + monitor_printf(mon, "dirty pages rate: %" PRIu64 " pagfes\n", + info->ram->dirty_pages_rate); + } } if (info->has_disk) { diff --git a/migration.c b/migration.c index 28e23db..8d67e9b 100644 --- a/migration.c +++ b/migration.c @@ -178,6 +178,8 @@ MigrationInfo *qmp_query_migrate(Error **errp) info->ram->duplicate = dup_mig_pages_transferred(); info->ram->normal = norm_mig_pages_transferred(); info->ram->normal_bytes = norm_mig_bytes_transferred(); + info->ram->dirty_pages_rate = s->dirty_pages_rate; + if (blk_mig_active()) { info->has_disk = true; diff --git a/migration.h b/migration.h index 552200c..66d7f68 100644 --- a/migration.h +++ b/migration.h @@ -42,6 +42,7 @@ struct MigrationState int64_t total_time; int64_t downtime; int64_t expected_downtime; + int64_t dirty_pages_rate; bool enabled_capabilities[MIGRATION_CAPABILITY_MAX]; int64_t xbzrle_cache_size; }; diff --git a/qapi-schema.json b/qapi-schema.json index 3dcc12f..55ef73c 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -266,11 +266,15 @@ # # @normal-bytes : number of normal bytes sent (since 1.2) # +# @dirty-pages-rate: number of pages dirtied by second by the +# guest. (since 1.2) +# # Since: 0.14.0 ## { 'type': 'MigrationStats', 'data': {'transferred': 'int', 'remaining': 'int', 'total': 'int' , - 'duplicate': 'int', 'normal': 'int', 'normal-bytes': 'int' } } + 'duplicate': 'int', 'normal': 'int', 'normal-bytes': 'int', + 'dirty-pages-rate' : 'int' } } ## # @XBZRLECacheStats