From patchwork Fri Mar 22 14:19:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 230055 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 6AE2D2C00A6 for ; Sat, 23 Mar 2013 01:29:48 +1100 (EST) Received: from localhost ([::1]:33376 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ2yY-0003yz-JY for incoming@patchwork.ozlabs.org; Fri, 22 Mar 2013 10:29:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35838) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ2s5-0002EM-KP for qemu-devel@nongnu.org; Fri, 22 Mar 2013 10:23:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UJ2s1-0006sy-MD for qemu-devel@nongnu.org; Fri, 22 Mar 2013 10:23:05 -0400 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:44237) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ2s1-0006s7-5O for qemu-devel@nongnu.org; Fri, 22 Mar 2013 10:23:01 -0400 Received: from /spool/local by e28smtp04.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 22 Mar 2013 19:49:36 +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; Fri, 22 Mar 2013 19:49:35 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 0DDC0394004F for ; Fri, 22 Mar 2013 19:52:58 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r2MEMr7G7995812 for ; Fri, 22 Mar 2013 19:52:53 +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 r2MEMvM8027583 for ; Sat, 23 Mar 2013 01:22:57 +1100 Received: from RH63Wenchao ([9.125.29.101]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r2MEJPjp008189; Sat, 23 Mar 2013 01:22:54 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Fri, 22 Mar 2013 22:19:09 +0800 Message-Id: <1363961953-13561-14-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1363961953-13561-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1363961953-13561-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13032214-5564-0000-0000-0000072FD950 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, aliguori@us.ibm.com, stefanha@gmail.com, armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V10 13/17] hmp: switch snapshot info function to qmp based one 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 patch using new added function in last commit which retrieve info from qmp for snapshot info. Signed-off-by: Wenchao Xia Reviewed-by: Eric Blake --- monitor.c | 2 +- savevm.c | 64 ------------------------------------------------------------- 2 files changed, 1 insertions(+), 65 deletions(-) diff --git a/monitor.c b/monitor.c index 680d344..e927c71 100644 --- a/monitor.c +++ b/monitor.c @@ -2611,7 +2611,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 04fcd10..30a8e5a 100644 --- a/savevm.c +++ b/savevm.c @@ -2344,70 +2344,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,