From patchwork Sat Apr 13 08:56:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 236318 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 7869C2C00A1 for ; Sat, 13 Apr 2013 19:07:21 +1000 (EST) Received: from localhost ([::1]:41128 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQwQZ-0001lV-JP for incoming@patchwork.ozlabs.org; Sat, 13 Apr 2013 05:07:19 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQwKu-0002RH-LS for qemu-devel@nongnu.org; Sat, 13 Apr 2013 05:01:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQwKt-0001Bi-NE for qemu-devel@nongnu.org; Sat, 13 Apr 2013 05:01:28 -0400 Received: from e23smtp08.au.ibm.com ([202.81.31.141]:43292) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQwKt-0001BQ-4x for qemu-devel@nongnu.org; Sat, 13 Apr 2013 05:01:27 -0400 Received: from /spool/local by e23smtp08.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 13 Apr 2013 18:59:14 +1000 Received: from d23dlp03.au.ibm.com (202.81.31.214) by e23smtp08.au.ibm.com (202.81.31.205) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sat, 13 Apr 2013 18:59:13 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id C0A76357804A for ; Sat, 13 Apr 2013 19:01:23 +1000 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r3D8lNNO065990 for ; Sat, 13 Apr 2013 18:47:23 +1000 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r3D90pi1030120 for ; Sat, 13 Apr 2013 19:00:52 +1000 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.157]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r3D8u24T020091; Sat, 13 Apr 2013 19:00:48 +1000 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Sat, 13 Apr 2013 16:56:45 +0800 Message-Id: <1365843407-16504-17-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1365843407-16504-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1365843407-16504-1-git-send-email-xiawenc@linux.vnet.ibm.com> x-cbid: 13041308-5140-0000-0000-000003065B6C X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.141 Cc: kwolf@redhat.com, phrdina@redhat.com, stefanha@gmail.com, armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V12 16/18] 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: Kevin Wolf Reviewed-by: Eric Blake --- monitor.c | 2 +- savevm.c | 65 ------------------------------------------------------------- 2 files changed, 1 insertions(+), 66 deletions(-) diff --git a/monitor.c b/monitor.c index c897e80..a2b1e3f 100644 --- a/monitor.c +++ b/monitor.c @@ -2630,7 +2630,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 e125567..59e329e 100644 --- a/savevm.c +++ b/savevm.c @@ -2459,71 +2459,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; - - 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) { - bdrv_snapshot_dump(NULL); - monitor_printf(mon, "\n"); - for (i = 0; i < total; i++) { - sn = &sn_tab[available_snapshots[i]]; - bdrv_snapshot_dump(sn); - monitor_printf(mon, "\n"); - } - } 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,