From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:58157)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <phrdina@redhat.com>) id 1Tui1F-0006dA-Pr
	for qemu-devel@nongnu.org; Mon, 14 Jan 2013 06:16:04 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <phrdina@redhat.com>) id 1Tui14-0003Ej-39
	for qemu-devel@nongnu.org; Mon, 14 Jan 2013 06:15:57 -0500
Received: from mx1.redhat.com ([209.132.183.28]:25842)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <phrdina@redhat.com>) id 1Tui13-0003E7-QJ
	for qemu-devel@nongnu.org; Mon, 14 Jan 2013 06:15:45 -0500
Message-ID: <1358162137.22120.4.camel@localhost>
From: Pavel Hrdina <phrdina@redhat.com>
Date: Mon, 14 Jan 2013 12:15:37 +0100
In-Reply-To: <1358147387-8221-12-git-send-email-xiawenc@linux.vnet.ibm.com>
References: <1358147387-8221-1-git-send-email-xiawenc@linux.vnet.ibm.com>
	<1358147387-8221-12-git-send-email-xiawenc@linux.vnet.ibm.com>
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH V3 11/11] hmp: show snapshot on single
	block device
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
Cc: aliguori@us.ibm.com, stefanha@gmail.com, qemu-devel@nongnu.org, lcapitulino@redhat.com, pbonzini@redhat.com, armbru@redhat.com

On Mon, 2013-01-14 at 15:09 +0800, Wenchao Xia wrote:
>   This patch use block layer API to qmp snapshot info on a block
> device, then use the same code dumping vm snapshot info, to print
> in monitor.
> 
> Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
> ---
> Note:
>   This patch need previous hmp extention patch which enable
> info sub command take qdict * as paramter.

> diff --git a/savevm.c b/savevm.c
> index cabdcb6..cd474e9 100644
> --- a/savevm.c
> +++ b/savevm.c
> @@ -2354,9 +2354,50 @@ static void do_info_snapshots_vm(Monitor *mon)
>      return;
>  }
>  
> +static void do_info_snapshots_blk(Monitor *mon, const char *device)
> +{
> +    Error *err = NULL;
> +    SnapshotInfoList *list;
> +    BlockDriverState *bs;
> +
> +    /* find the target bs */
> +    bs = bdrv_find(device);
> +    if (!bs) {
> +        monitor_printf(mon, "Device '%s' not found.\n", device);
> +        return ;
> +    }
> +
> +    if (!bdrv_can_snapshot(bs)) {
> +        monitor_printf(mon, "Device '%s' can't have snapshot.\n", device);
> +        return ;
> +    }
> +
> +    list = bdrv_query_snapshot_infolist(bs, NULL, NULL, &err);
> +    if (error_is_set(&err)) {
> +        hmp_handle_error(mon, &err);
> +        return;
> +    }
> +
> +    if (list == NULL) {
> +        monitor_printf(mon, "There is no snapshot available.\n");
> +        return;
> +    }
> +
> +    monitor_printf(mon, "Device '%s':\n", device);
> +    monitor_dump_snapshotinfolist(mon, list);
> +    qapi_free_SnapshotInfoList(list);
> +    return;
> +}
> +
>  void do_info_snapshots(Monitor *mon, const QDict *qdict)
>  {
> -    do_info_snapshots_vm(mon);
> +    const char *device = qdict_get_try_str(qdict, "device");
> +    if (!device) {
> +        do_info_snapshots_vm(mon);
> +    } else {
> +        do_info_snapshots_blk(mon, device);
> +    }
> +    return;
>  }
>  

I think that you should move these functions into hmp.c file. This also
applies to previous patch and according to this changes you don't have
to export hmp_handle_error() function which should be used only in hmp.c

Pavel