From patchwork Mon Mar 11 11:23:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 226538 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 0A62A2C008E for ; Mon, 11 Mar 2013 22:46:15 +1100 (EST) Received: from localhost ([::1]:44375 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UF0wY-0006HY-1n for incoming@patchwork.ozlabs.org; Mon, 11 Mar 2013 07:31:02 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52951) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UF0rd-0006zh-G0 for qemu-devel@nongnu.org; Mon, 11 Mar 2013 07:25:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UF0rb-0001dK-OQ for qemu-devel@nongnu.org; Mon, 11 Mar 2013 07:25:57 -0400 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:54153) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UF0ra-0001cq-Jq for qemu-devel@nongnu.org; Mon, 11 Mar 2013 07:25:55 -0400 Received: from /spool/local by e28smtp04.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 11 Mar 2013 16:52:49 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp04.in.ibm.com (192.168.1.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 11 Mar 2013 16:52:47 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 65E04394002D for ; Mon, 11 Mar 2013 16:55:50 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r2BBPlAA30933124 for ; Mon, 11 Mar 2013 16:55:47 +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 r2BBPnBH026932 for ; Mon, 11 Mar 2013 22:25:49 +1100 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.175] (may be forged)) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r2BBNRVI015564; Mon, 11 Mar 2013 22:25:47 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Mon, 11 Mar 2013 19:23:16 +0800 Message-Id: <1363000996-13221-15-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1363000996-13221-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1363000996-13221-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13031111-5564-0000-0000-000006F88904 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 V9 14/14] hmp: add command info images 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 This command will show block image's information, including internal snapshots. Signed-off-by: Wenchao Xia --- hmp.c | 38 ++++++++++++++++++++++++++++++++++++++ hmp.h | 1 + monitor.c | 7 +++++++ 3 files changed, 46 insertions(+), 0 deletions(-) diff --git a/hmp.c b/hmp.c index 34f0691..05d9b3b 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) { @@ -649,6 +650,43 @@ void hmp_info_snapshots(Monitor *mon, const QDict *qdict) qapi_free_SnapshotInfoList(list); } +#define IMAGE_INFO_BUF_SIZE (2048) +static void mon_dump_device_image_info_list(Monitor *mon, + DeviceImageInfoList *list) +{ + char *buf = g_malloc0(IMAGE_INFO_BUF_SIZE); + DeviceImageInfoList *p = list; + DeviceImageInfo *dii; + while (p) { + dii = p->value; + monitor_printf(mon, "Device : %s\n", dii->device); + if (dii->has_image) { + bdrv_image_info_dump(buf, IMAGE_INFO_BUF_SIZE, dii->image); + monitor_printf(mon, "%s", buf); + } + monitor_printf(mon, "\n"); + + p = p->next; + } + g_free(buf); +} + +void hmp_info_images(Monitor *mon, const QDict *qdict) +{ + const char *device = qdict_get_try_str(qdict, "device"); + int backing = qdict_get_try_bool(qdict, "backing", 0); + Error *err = NULL; + DeviceImageInfoList *list = NULL; + + list = qmp_query_images(!!device, device, true, backing, &err); + if (!error_is_set(&err) && list) { + mon_dump_device_image_info_list(mon, list); + } + + hmp_handle_error(mon, &err); + qapi_free_DeviceImageInfoList(list); +} + void hmp_quit(Monitor *mon, const QDict *qdict) { monitor_suspend(mon); diff --git a/hmp.h b/hmp.h index 0b0ae13..9d9ada3 100644 --- a/hmp.h +++ b/hmp.h @@ -37,6 +37,7 @@ void hmp_info_balloon(Monitor *mon, const QDict *qdict); void hmp_info_pci(Monitor *mon, const QDict *qdict); void hmp_info_block_jobs(Monitor *mon, const QDict *qdict); void hmp_info_snapshots(Monitor *mon, const QDict *qdict); +void hmp_info_images(Monitor *mon, const QDict *qdict); void hmp_quit(Monitor *mon, const QDict *qdict); void hmp_stop(Monitor *mon, const QDict *qdict); void hmp_system_reset(Monitor *mon, const QDict *qdict); diff --git a/monitor.c b/monitor.c index 5112375..b470963 100644 --- a/monitor.c +++ b/monitor.c @@ -2597,6 +2597,13 @@ static mon_cmd_t info_cmds[] = { .mhandler.cmd = hmp_info_snapshots, }, { + .name = "images", + .args_type = "backing:-b,device:B?", + .params = "[-b] [device]", + .help = "show the image info", + .mhandler.cmd = hmp_info_images, + }, + { .name = "status", .args_type = "", .params = "",