From patchwork Tue Apr 2 11:47:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 232986 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CC3F62C013B for ; Tue, 2 Apr 2013 22:58:05 +1100 (EST) Received: from localhost ([::1]:42825 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMzqm-0006bd-1J for incoming@patchwork.ozlabs.org; Tue, 02 Apr 2013 07:58:04 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMzjU-0003XO-NV for qemu-devel@nongnu.org; Tue, 02 Apr 2013 07:50:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UMzjT-000429-9l for qemu-devel@nongnu.org; Tue, 02 Apr 2013 07:50:32 -0400 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:60932) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMzjS-00041i-DZ for qemu-devel@nongnu.org; Tue, 02 Apr 2013 07:50:31 -0400 Received: from /spool/local by e28smtp04.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 2 Apr 2013 17:16:45 +0530 Received: from d28dlp03.in.ibm.com (9.184.220.128) by e28smtp04.in.ibm.com (192.168.1.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 2 Apr 2013 17:16:43 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id A50BC125804F for ; Tue, 2 Apr 2013 17:21:44 +0530 (IST) Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r32BoMJP4456840 for ; Tue, 2 Apr 2013 17:20:22 +0530 Received: from d28av01.in.ibm.com (loopback [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r32BoNKJ004965 for ; Tue, 2 Apr 2013 11:50:25 GMT Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.29]) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r32BlY3H025943; Tue, 2 Apr 2013 11:50:19 GMT From: Wenchao Xia To: qemu-devel@nongnu.org Date: Tue, 2 Apr 2013 19:47:29 +0800 Message-Id: <1364903250-10429-17-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1364903250-10429-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1364903250-10429-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13040211-5564-0000-0000-00000754AF15 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.4 Cc: kwolf@redhat.com, stefanha@gmail.com, armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V11 16/17] hmp: show ImageInfo in 'info block' 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 Now human monitor can show image details include internal snapshot info for every block device. Signed-off-by: Wenchao Xia --- hmp.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/hmp.c b/hmp.c index 89e1aaf..6f93fcd 100644 --- a/hmp.c +++ b/hmp.c @@ -278,6 +278,8 @@ void hmp_info_cpus(Monitor *mon, const QDict *qdict) void hmp_info_block(Monitor *mon, const QDict *qdict) { BlockInfoList *block_list, *info; + ImageInfo *image_info; + GString *buf = NULL; block_list = qmp_query_block(NULL); @@ -319,6 +321,23 @@ 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_string_sized_new(2048); + } + monitor_printf(mon, " images:\n"); + image_info = info->value->inserted->image; + while (1) { + bdrv_image_info_dump(buf, image_info); + monitor_printf(mon, "%s", buf->str); + g_string_set_size(buf, 0); + if (image_info->has_backing_image) { + image_info = image_info->backing_image; + } else { + break; + } + } + } else { monitor_printf(mon, " [not inserted]"); } @@ -326,6 +345,9 @@ void hmp_info_block(Monitor *mon, const QDict *qdict) monitor_printf(mon, "\n"); } + if (buf) { + g_string_free(buf, true); + } qapi_free_BlockInfoList(block_list); }