From patchwork Fri Jun 7 11:58:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 249682 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 151E22C00A9 for ; Fri, 7 Jun 2013 22:09:38 +1000 (EST) Received: from localhost ([::1]:34218 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkvU8-0006qT-1u for incoming@patchwork.ozlabs.org; Fri, 07 Jun 2013 08:09:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57570) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkvKg-0002Fa-T9 for qemu-devel@nongnu.org; Fri, 07 Jun 2013 07:59:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UkvKe-0004Ro-Ej for qemu-devel@nongnu.org; Fri, 07 Jun 2013 07:59:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42904) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkvKe-0004Rj-76 for qemu-devel@nongnu.org; Fri, 07 Jun 2013 07:59:48 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r57BxkHM001679 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 7 Jun 2013 07:59:46 -0400 Received: from localhost (ovpn-112-30.ams2.redhat.com [10.36.112.30]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r57BxiVJ017843; Fri, 7 Jun 2013 07:59:45 -0400 From: Stefan Hajnoczi To: Date: Fri, 7 Jun 2013 13:58:44 +0200 Message-Id: <1370606325-10680-26-git-send-email-stefanha@redhat.com> In-Reply-To: <1370606325-10680-1-git-send-email-stefanha@redhat.com> References: <1370606325-10680-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Anthony Liguori , Wenchao Xia , Stefan Hajnoczi Subject: [Qemu-devel] [PULL 25/26] 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 From: Wenchao Xia Now human monitor can show image details, include internal snapshot and backing chain info for every block device. Signed-off-by: Wenchao Xia Signed-off-by: Stefan Hajnoczi --- hmp.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hmp.c b/hmp.c index 64e0baa..4fc3bfe 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" #include "qemu-io.h" static void hmp_handle_error(Monitor *mon, Error **errp) @@ -278,6 +279,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); @@ -319,6 +321,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]"); }