qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, aliguori@us.ibm.com, stefanha@gmail.com,
	armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com,
	Wenchao Xia <xiawenc@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH V10 16/17] hmp: show ImageInfo in 'info block'
Date: Fri, 22 Mar 2013 22:19:12 +0800	[thread overview]
Message-ID: <1363961953-13561-17-git-send-email-xiawenc@linux.vnet.ibm.com> (raw)
In-Reply-To: <1363961953-13561-1-git-send-email-xiawenc@linux.vnet.ibm.com>

  Now human monitor can show image details include internal
snapshot info for every block device.

Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
---
 hmp.c |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/hmp.c b/hmp.c
index c475d65..49f851b 100644
--- a/hmp.c
+++ b/hmp.c
@@ -22,6 +22,7 @@
 #include "qemu/sockets.h"
 #include "monitor/monitor.h"
 #include "ui/console.h"
+#include "block/qapi.h"
 
 static void hmp_handle_error(Monitor *mon, Error **errp)
 {
@@ -272,9 +273,12 @@ void hmp_info_cpus(Monitor *mon, const QDict *qdict)
     qapi_free_CpuInfoList(cpu_list);
 }
 
+#define IMAGE_INFO_BUF_SIZE (2048)
 void hmp_info_block(Monitor *mon, const QDict *qdict)
 {
     BlockInfoList *block_list, *info;
+    ImageInfo *image_info;
+    char *buf = NULL;
 
     block_list = qmp_query_block(NULL);
 
@@ -316,6 +320,22 @@ void hmp_info_block(Monitor *mon, const QDict *qdict)
                             info->value->inserted->iops,
                             info->value->inserted->iops_rd,
                             info->value->inserted->iops_wr);
+
+            if (!buf) {
+                buf = g_malloc0(IMAGE_INFO_BUF_SIZE);
+            }
+            monitor_printf(mon, " images:\n");
+            image_info = info->value->inserted->image;
+            while (1) {
+                bdrv_image_info_dump(buf, IMAGE_INFO_BUF_SIZE, image_info);
+                monitor_printf(mon, "%s", buf);
+                if (image_info->has_backing_image) {
+                    image_info = image_info->backing_image;
+                } else {
+                    break;
+                }
+            }
+
         } else {
             monitor_printf(mon, " [not inserted]");
         }
@@ -323,6 +343,7 @@ void hmp_info_block(Monitor *mon, const QDict *qdict)
         monitor_printf(mon, "\n");
     }
 
+    g_free(buf);
     qapi_free_BlockInfoList(block_list);
 }
 
-- 
1.7.1

  parent reply	other threads:[~2013-03-22 14:23 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-22 14:18 [Qemu-devel] [PATCH V10 00/17] qmp/hmp interfaces for internal snapshot info Wenchao Xia
2013-03-22 14:18 ` [Qemu-devel] [PATCH V10 01/17] block: move bdrv_snapshot_find() to block/snapshot.c Wenchao Xia
2013-03-22 14:18 ` [Qemu-devel] [PATCH V10 02/17] block: distinguish id and name in bdrv_find_snapshot() Wenchao Xia
2013-03-22 14:18 ` [Qemu-devel] [PATCH V10 03/17] qemu-img: remove unused parameter in collect_image_info() Wenchao Xia
2013-03-22 14:19 ` [Qemu-devel] [PATCH V10 04/17] block: move collect_snapshots() and collect_image_info() to block/qapi.c Wenchao Xia
2013-03-22 14:19 ` [Qemu-devel] [PATCH V10 05/17] block: add snapshot info query function bdrv_query_snapshot_info_list() Wenchao Xia
2013-03-27 21:31   ` Eric Blake
2013-03-22 14:19 ` [Qemu-devel] [PATCH V10 06/17] block: add check for VM snapshot in bdrv_query_snapshot_info_list() Wenchao Xia
2013-03-22 14:19 ` [Qemu-devel] [PATCH V10 07/17] block: add image info query function bdrv_query_image_info() Wenchao Xia
2013-03-22 14:19 ` [Qemu-devel] [PATCH V10 08/17] block: move qmp_query_block() and bdrv_query_info() to block/qapi.c Wenchao Xia
2013-03-29 20:10   ` Eric Blake
2013-03-30 12:32     ` Wenchao Xia
2013-03-22 14:19 ` [Qemu-devel] [PATCH V10 09/17] qmp: add interface query-snapshots Wenchao Xia
2013-03-22 14:19 ` [Qemu-devel] [PATCH V10 10/17] qmp: add recursive member in ImageInfo Wenchao Xia
2013-03-29 22:54   ` Eric Blake
2013-03-22 14:19 ` [Qemu-devel] [PATCH V10 11/17] qmp: add ImageInfo in BlockDeviceInfo used by query-block Wenchao Xia
2013-03-28  9:54   ` Kevin Wolf
2013-03-29  2:35     ` Wenchao Xia
2013-04-02  8:09       ` Kevin Wolf
2013-04-02  8:54         ` Wenchao Xia
2013-04-02  9:30           ` Kevin Wolf
2013-03-22 14:19 ` [Qemu-devel] [PATCH V10 12/17] hmp: add function hmp_info_snapshots() Wenchao Xia
2013-03-29 23:04   ` Eric Blake
2013-03-30 12:38     ` Wenchao Xia
2013-04-02  7:39       ` Kevin Wolf
2013-03-22 14:19 ` [Qemu-devel] [PATCH V10 13/17] hmp: switch snapshot info function to qmp based one Wenchao Xia
2013-04-01 15:56   ` Eric Blake
2013-03-22 14:19 ` [Qemu-devel] [PATCH V10 14/17] block: move dump_human_image_info() to block/qapi.c Wenchao Xia
2013-03-22 14:19 ` [Qemu-devel] [PATCH V10 15/17] block: dump to buffer for bdrv_image_info_dump() Wenchao Xia
2013-04-01 19:17   ` Eric Blake
2013-04-02  2:42     ` Wenchao Xia
2013-03-22 14:19 ` Wenchao Xia [this message]
2013-03-28 11:06   ` [Qemu-devel] [PATCH V10 16/17] hmp: show ImageInfo in 'info block' Kevin Wolf
2013-03-22 14:19 ` [Qemu-devel] [PATCH V10 17/17] hmp: add parameter device and -b for info block Wenchao Xia
2013-03-28 11:09   ` Kevin Wolf
2013-03-29  2:48     ` Wenchao Xia
2013-04-02  7:46       ` Kevin Wolf
2013-03-28 11:10 ` [Qemu-devel] [PATCH V10 00/17] qmp/hmp interfaces for internal snapshot info Kevin Wolf

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=1363961953-13561-17-git-send-email-xiawenc@linux.vnet.ibm.com \
    --to=xiawenc@linux.vnet.ibm.com \
    --cc=aliguori@us.ibm.com \
    --cc=armbru@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=lcapitulino@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@gmail.com \
    /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).