From patchwork Wed Feb 8 20:30:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 140215 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A51B5B71AA for ; Thu, 9 Feb 2012 07:31:52 +1100 (EST) Received: from localhost ([::1]:54355 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvEBB-00053u-Oe for incoming@patchwork.ozlabs.org; Wed, 08 Feb 2012 15:31:49 -0500 Received: from eggs.gnu.org ([140.186.70.92]:32813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvEAV-0002wb-6R for qemu-devel@nongnu.org; Wed, 08 Feb 2012 15:31:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RvEAO-0001DE-Uu for qemu-devel@nongnu.org; Wed, 08 Feb 2012 15:31:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:5807) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvEAO-0001D4-L4 for qemu-devel@nongnu.org; Wed, 08 Feb 2012 15:31:00 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q18KUx3e002666 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 8 Feb 2012 15:31:00 -0500 Received: from localhost (ovpn-116-68.ams2.redhat.com [10.36.116.68]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q18KUwN4007775; Wed, 8 Feb 2012 15:30:59 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 8 Feb 2012 18:30:39 -0200 Message-Id: <1328733040-16697-6-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1328733040-16697-1-git-send-email-lcapitulino@redhat.com> References: <1328733040-16697-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 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, aliguori@us.ibm.com, armbru@redhat.com, agl@us.ibm.com Subject: [Qemu-devel] [PATCH 5/6] balloon: Drop old stats interface 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 It has never been used and next patches will introduce a new, usable interface. Note that dropping this won't break compatibility because all fields are optional. Signed-off-by: Luiz Capitulino --- hmp.c | 25 +------------------------ qapi-schema.json | 21 +-------------------- 2 files changed, 2 insertions(+), 44 deletions(-) diff --git a/hmp.c b/hmp.c index 8ff8c94..4cd99a1 100644 --- a/hmp.c +++ b/hmp.c @@ -381,30 +381,7 @@ void hmp_info_balloon(Monitor *mon) return; } - monitor_printf(mon, "balloon: actual=%" PRId64, info->actual >> 20); - if (info->has_mem_swapped_in) { - monitor_printf(mon, " mem_swapped_in=%" PRId64, info->mem_swapped_in); - } - if (info->has_mem_swapped_out) { - monitor_printf(mon, " mem_swapped_out=%" PRId64, info->mem_swapped_out); - } - if (info->has_major_page_faults) { - monitor_printf(mon, " major_page_faults=%" PRId64, - info->major_page_faults); - } - if (info->has_minor_page_faults) { - monitor_printf(mon, " minor_page_faults=%" PRId64, - info->minor_page_faults); - } - if (info->has_free_mem) { - monitor_printf(mon, " free_mem=%" PRId64, info->free_mem); - } - if (info->has_total_mem) { - monitor_printf(mon, " total_mem=%" PRId64, info->total_mem); - } - - monitor_printf(mon, "\n"); - + monitor_printf(mon, "balloon: actual=%" PRId64 "\n", info->actual >> 20); qapi_free_BalloonInfo(info); } diff --git a/qapi-schema.json b/qapi-schema.json index d02ee86..24a42e3 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -679,28 +679,9 @@ # # @actual: the number of bytes the balloon currently contains # -# @mem_swapped_in: #optional number of pages swapped in within the guest -# -# @mem_swapped_out: #optional number of pages swapped out within the guest -# -# @major_page_faults: #optional number of major page faults within the guest -# -# @minor_page_faults: #optional number of minor page faults within the guest -# -# @free_mem: #optional amount of memory (in bytes) free in the guest -# -# @total_mem: #optional amount of memory (in bytes) visible to the guest -# # Since: 0.14.0 -# -# Notes: all current versions of QEMU do not fill out optional information in -# this structure. ## -{ 'type': 'BalloonInfo', - 'data': {'actual': 'int', '*mem_swapped_in': 'int', - '*mem_swapped_out': 'int', '*major_page_faults': 'int', - '*minor_page_faults': 'int', '*free_mem': 'int', - '*total_mem': 'int'} } +{ 'type': 'BalloonInfo', 'data': { 'actual': 'int' } } ## # @query-balloon: