From patchwork Fri Mar 22 14:19:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 230080 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 F1DED2C009F for ; Sat, 23 Mar 2013 01:54:48 +1100 (EST) Received: from localhost ([::1]:41529 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ32i-000097-Ve for incoming@patchwork.ozlabs.org; Fri, 22 Mar 2013 10:34:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35972) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ2sO-0002rA-My for qemu-devel@nongnu.org; Fri, 22 Mar 2013 10:23:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UJ2sJ-0006wn-L6 for qemu-devel@nongnu.org; Fri, 22 Mar 2013 10:23:24 -0400 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:39300) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ2sJ-0006wJ-1w for qemu-devel@nongnu.org; Fri, 22 Mar 2013 10:23:19 -0400 Received: from /spool/local by e28smtp07.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 22 Mar 2013 19:49:27 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp07.in.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 22 Mar 2013 19:49:25 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 4F66DE0059 for ; Fri, 22 Mar 2013 19:54:45 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r2MENC3h11075866 for ; Fri, 22 Mar 2013 19:53:12 +0530 Received: from d28av02.in.ibm.com (loopback [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r2MENBp3028938 for ; Sat, 23 Mar 2013 01:23:13 +1100 Received: from RH63Wenchao ([9.125.29.101]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r2MEJPjs008189; Sat, 23 Mar 2013 01:23:08 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Fri, 22 Mar 2013 22:19:12 +0800 Message-Id: <1363961953-13561-17-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1363961953-13561-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1363961953-13561-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13032214-8878-0000-0000-0000066834CF X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.7 Cc: kwolf@redhat.com, aliguori@us.ibm.com, stefanha@gmail.com, armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V10 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 | 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); }