qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: anthony@codemonkey.ws
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 20/21] Fix docs for block stats monitor command
Date: Fri, 14 May 2010 19:10:54 +0200	[thread overview]
Message-ID: <1273857055-26715-21-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1273857055-26715-1-git-send-email-kwolf@redhat.com>

From: Daniel P. Berrange <berrange@redhat.com>

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 <berrange@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 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

  parent reply	other threads:[~2010-05-14 17:12 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-14 17:10 [Qemu-devel] [PULL 00/21] Block patches Kevin Wolf
2010-05-14 17:10 ` [Qemu-devel] [PATCH 01/21] block: Remove semicolon in BDRV_SECTOR_MASK macro Kevin Wolf
2010-05-14 17:10 ` [Qemu-devel] [PATCH 02/21] qemu-nbd: Improve error reporting Kevin Wolf
2010-05-14 17:10 ` [Qemu-devel] [PATCH 03/21] cloop: use pread Kevin Wolf
2010-05-14 17:10 ` [Qemu-devel] [PATCH 04/21] cloop: use qemu block API Kevin Wolf
2010-05-14 17:10 ` [Qemu-devel] [PATCH 05/21] ide: Fix ide_dma_cancel Kevin Wolf
2010-05-14 17:10 ` [Qemu-devel] [PATCH 06/21] bochs: use pread Kevin Wolf
2010-05-14 17:10 ` [Qemu-devel] [PATCH 07/21] bochs: use qemu block API Kevin Wolf
2010-05-14 17:10 ` [Qemu-devel] [PATCH 08/21] block: Avoid unchecked casts for AIOCBs Kevin Wolf
2010-05-14 17:10 ` [Qemu-devel] [PATCH 09/21] block: Fix protocol detection for Windows devices Kevin Wolf
2010-05-14 17:10 ` [Qemu-devel] [PATCH 10/21] block: Fix bdrv_commit Kevin Wolf
2010-05-14 17:10 ` [Qemu-devel] [PATCH 11/21] block/vdi: Allow disk images of size 0 Kevin Wolf
2010-05-14 17:10 ` [Qemu-devel] [PATCH 12/21] parallels: use pread Kevin Wolf
2010-05-14 17:10 ` [Qemu-devel] [PATCH 13/21] parallels: use qemu block API Kevin Wolf
2010-05-14 17:10 ` [Qemu-devel] [PATCH 14/21] block/vpc: Fix conversion from size to disk geometry Kevin Wolf
2010-05-14 17:10 ` [Qemu-devel] [PATCH 15/21] dmg: fix reading of uncompressed chunks Kevin Wolf
2010-05-14 17:10 ` [Qemu-devel] [PATCH 16/21] dmg: use pread Kevin Wolf
2010-05-14 17:10 ` [Qemu-devel] [PATCH 17/21] dmg: use qemu block API Kevin Wolf
2010-05-14 17:10 ` [Qemu-devel] [PATCH 18/21] block/vdi: Fix image opening and creation for odd disk sizes Kevin Wolf
2010-05-14 17:10 ` [Qemu-devel] [PATCH 19/21] use qemu_free() instead of free() Kevin Wolf
2010-05-14 17:10 ` Kevin Wolf [this message]
2010-05-14 17:10 ` [Qemu-devel] [PATCH 21/21] block: Remove special case for vvfat Kevin Wolf
2010-05-17 18:22 ` [Qemu-devel] Re: [PULL 00/21] Block patches Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1273857055-26715-21-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=anthony@codemonkey.ws \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).