From patchwork Fri May 14 17:10:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 52650 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 43C32B825D for ; Sat, 15 May 2010 03:45:26 +1000 (EST) Received: from localhost ([127.0.0.1]:43350 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OCywt-0007X8-7V for incoming@patchwork.ozlabs.org; Fri, 14 May 2010 13:45:23 -0400 Received: from [140.186.70.92] (port=41453 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OCyQd-0000jc-M9 for qemu-devel@nongnu.org; Fri, 14 May 2010 13:12:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OCyQa-0001yq-Se for qemu-devel@nongnu.org; Fri, 14 May 2010 13:12:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35992) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OCyQa-0001yd-Kr for qemu-devel@nongnu.org; Fri, 14 May 2010 13:12:00 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4EHBw2f032156 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 14 May 2010 13:11:58 -0400 Received: from localhost.localdomain (vpn1-7-82.ams2.redhat.com [10.36.7.82]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o4EHBFWo004751; Fri, 14 May 2010 13:11:57 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Fri, 14 May 2010 19:10:54 +0200 Message-Id: <1273857055-26715-21-git-send-email-kwolf@redhat.com> In-Reply-To: <1273857055-26715-1-git-send-email-kwolf@redhat.com> References: <1273857055-26715-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 20/21] Fix docs for block stats monitor command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Daniel P. Berrange The 'parent' field in the 'query-blockstats' monitor command is part of the top level block device QDict, not part of the 2nd level 'stats' QDict. * block.c: Fix docs for 'parent' field in block stats monitor command output Signed-off-by: Daniel P. Berrange Signed-off-by: Kevin Wolf --- block.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/block.c b/block.c index 96ef1b1..7822580 100644 --- a/block.c +++ b/block.c @@ -1582,9 +1582,9 @@ static QObject* bdrv_info_stats_bs(BlockDriverState *bs) * - "wr_operations": write operations * - "wr_highest_offset": Highest offset of a sector written since the * BlockDriverState has been opened - * - "parent": Contains recursively the statistics of the underlying - * protocol (e.g. the host file for a qcow2 image). If there is no - * underlying protocol, this field is omitted. + * - "parent": A QDict recursively holding the statistics of the underlying + * protocol (e.g. the host file for a qcow2 image). If there is no + * underlying protocol, this field is omitted. * * Example: * @@ -1593,15 +1593,14 @@ static QObject* bdrv_info_stats_bs(BlockDriverState *bs) * "wr_bytes": 0, * "rd_operations": 1, * "wr_operations": 0, - * "wr_highest_offset": 0, - * "parent": { - * "stats": { "rd_bytes": 1024, - * "wr_bytes": 0, - * "rd_operations": 2, - * "wr_operations": 0, - * "wr_highest_offset": 0, - * } - * } } }, + * "wr_highest_offset": 0 }, + * "parent": { + * "stats": { "rd_bytes": 1024, + * "wr_bytes": 0, + * "rd_operations": 2, + * "wr_operations": 0, + * "wr_highest_offset": 0, + * } } }, * { "device": "ide1-cd0", * "stats": { "rd_bytes": 0, * "wr_bytes": 0,