From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Kevin Wolf 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> Subject: [Qemu-devel] [PATCH 20/21] Fix docs for block stats monitor command List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@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, -- 1.6.6.1