From patchwork Thu Jun 6 04:28:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 249271 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E500C2C01D4 for ; Thu, 6 Jun 2013 14:30:01 +1000 (EST) Received: from localhost ([::1]:33022 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkRpn-0004ao-So for incoming@patchwork.ozlabs.org; Thu, 06 Jun 2013 00:29:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48830) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkRpF-0004Rz-A3 for qemu-devel@nongnu.org; Thu, 06 Jun 2013 00:29:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UkRpE-0001FV-EV for qemu-devel@nongnu.org; Thu, 06 Jun 2013 00:29:25 -0400 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:38203) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkRpD-0001FE-RR for qemu-devel@nongnu.org; Thu, 06 Jun 2013 00:29:24 -0400 Received: from /spool/local by e23smtp05.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 6 Jun 2013 14:23:35 +1000 Received: from d23dlp02.au.ibm.com (202.81.31.213) by e23smtp05.au.ibm.com (202.81.31.211) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 6 Jun 2013 14:23:33 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id DE8E02BB0051 for ; Thu, 6 Jun 2013 14:29:15 +1000 (EST) Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r564EeiD1376760 for ; Thu, 6 Jun 2013 14:14:40 +1000 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r564TEJe015725 for ; Thu, 6 Jun 2013 14:29:15 +1000 Received: from RH63Wenchao.localdomain ([9.125.24.206]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r564S37N014080; Thu, 6 Jun 2013 14:29:11 +1000 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Thu, 6 Jun 2013 12:28:00 +0800 Message-Id: <1370492881-12410-5-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1370492881-12410-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1370492881-12410-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13060604-1396-0000-0000-00000312CAA9 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.147 Cc: kwolf@redhat.com, armbru@redhat.com, lcapitulino@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V15 4/5] 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 and backing chain info for every block device. Signed-off-by: Wenchao Xia --- hmp.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/hmp.c b/hmp.c index 4fb76ec..2aa832c 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) { @@ -277,6 +278,7 @@ 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; block_list = qmp_query_block(NULL); @@ -318,6 +320,18 @@ void hmp_info_block(Monitor *mon, const QDict *qdict) info->value->inserted->iops, info->value->inserted->iops_rd, info->value->inserted->iops_wr); + + monitor_printf(mon, " images:\n"); + image_info = info->value->inserted->image; + while (1) { + bdrv_image_info_dump((fprintf_function)monitor_printf, mon, + image_info); + if (image_info->has_backing_image) { + image_info = image_info->backing_image; + } else { + break; + } + } } else { monitor_printf(mon, " [not inserted]"); }