From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51221) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UDU23-0007wf-Fr for qemu-devel@nongnu.org; Thu, 07 Mar 2013 01:10:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UDU22-0004cO-2R for qemu-devel@nongnu.org; Thu, 07 Mar 2013 01:10:23 -0500 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:36917) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UDU21-0004c8-Gy for qemu-devel@nongnu.org; Thu, 07 Mar 2013 01:10:22 -0500 Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 7 Mar 2013 11:37:28 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 175EA394002D for ; Thu, 7 Mar 2013 11:40:16 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r276ACEI32309288 for ; Thu, 7 Mar 2013 11:40:13 +0530 Received: from d28av03.in.ibm.com (loopback [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r276ABw7031576 for ; Thu, 7 Mar 2013 17:10:13 +1100 From: Wenchao Xia Date: Thu, 7 Mar 2013 14:07:18 +0800 Message-Id: <1362636445-7188-14-git-send-email-xiawenc@linux.vnet.ibm.com> In-Reply-To: <1362636445-7188-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1362636445-7188-1-git-send-email-xiawenc@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH V8 13/20] hmp: switch snapshot info function to qmp based one List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, aliguori@us.ibm.com, capitulino@redhat.com, stefanha@gmail.com, armbru@redhat.com, pbonzini@redhat.com, Wenchao Xia This patch using new added function in last commit which retrieve info from qmp for snapshot info. Signed-off-by: Wenchao Xia --- monitor.c | 2 +- savevm.c | 64 ------------------------------------------------------------- 2 files changed, 1 insertions(+), 65 deletions(-) diff --git a/monitor.c b/monitor.c index 32a6e74..5112375 100644 --- a/monitor.c +++ b/monitor.c @@ -2594,7 +2594,7 @@ static mon_cmd_t info_cmds[] = { .args_type = "", .params = "", .help = "show the currently saved VM snapshots", - .mhandler.cmd = do_info_snapshots, + .mhandler.cmd = hmp_info_snapshots, }, { .name = "status", diff --git a/savevm.c b/savevm.c index 6557750..71e78dc 100644 --- a/savevm.c +++ b/savevm.c @@ -2319,70 +2319,6 @@ void do_delvm(Monitor *mon, const QDict *qdict) } } -void do_info_snapshots(Monitor *mon, const QDict *qdict) -{ - BlockDriverState *bs, *bs1; - QEMUSnapshotInfo *sn_tab, *sn, s, *sn_info = &s; - int nb_sns, i, ret, available; - int total; - int *available_snapshots; - char buf[256]; - - bs = bdrv_snapshots(); - if (!bs) { - monitor_printf(mon, "No available block device supports snapshots\n"); - return; - } - - nb_sns = bdrv_snapshot_list(bs, &sn_tab); - if (nb_sns < 0) { - monitor_printf(mon, "bdrv_snapshot_list: error %d\n", nb_sns); - return; - } - - if (nb_sns == 0) { - monitor_printf(mon, "There is no snapshot available.\n"); - return; - } - - available_snapshots = g_malloc0(sizeof(int) * nb_sns); - total = 0; - for (i = 0; i < nb_sns; i++) { - sn = &sn_tab[i]; - available = 1; - bs1 = NULL; - - while ((bs1 = bdrv_next(bs1))) { - if (bdrv_can_snapshot(bs1) && bs1 != bs) { - ret = bdrv_snapshot_find(bs1, sn_info, sn->id_str, NULL); - if (ret < 0) { - available = 0; - break; - } - } - } - - if (available) { - available_snapshots[total] = i; - total++; - } - } - - if (total > 0) { - monitor_printf(mon, "%s\n", bdrv_snapshot_dump(buf, sizeof(buf), NULL)); - for (i = 0; i < total; i++) { - sn = &sn_tab[available_snapshots[i]]; - monitor_printf(mon, "%s\n", bdrv_snapshot_dump(buf, sizeof(buf), sn)); - } - } else { - monitor_printf(mon, "There is no suitable snapshot available\n"); - } - - g_free(sn_tab); - g_free(available_snapshots); - -} - void vmstate_register_ram(MemoryRegion *mr, DeviceState *dev) { qemu_ram_set_idstr(memory_region_get_ram_addr(mr) & TARGET_PAGE_MASK, -- 1.7.1