From patchwork Sat Dec 29 08:45:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 208637 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 1D1F52C00DC for ; Sat, 29 Dec 2012 20:23:00 +1100 (EST) Received: from localhost ([::1]:38949 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tosd8-0004vh-7N for incoming@patchwork.ozlabs.org; Sat, 29 Dec 2012 04:22:58 -0500 Received: from eggs.gnu.org ([208.118.235.92]:59152) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tos5o-00067S-FZ for qemu-devel@nongnu.org; Sat, 29 Dec 2012 03:48:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tos5l-0005Rs-PN for qemu-devel@nongnu.org; Sat, 29 Dec 2012 03:48:32 -0500 Received: from e28smtp02.in.ibm.com ([122.248.162.2]:34912) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tos5l-0005Rg-5J for qemu-devel@nongnu.org; Sat, 29 Dec 2012 03:48:29 -0500 Received: from /spool/local by e28smtp02.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 29 Dec 2012 14:17:20 +0530 Received: from d28dlp03.in.ibm.com (9.184.220.128) by e28smtp02.in.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sat, 29 Dec 2012 14:17:18 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 49D0B125804D for ; Sat, 29 Dec 2012 14:18:29 +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 qBT8mNip44236932 for ; Sat, 29 Dec 2012 14:18:24 +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 qBT8mOeo022486 for ; Sat, 29 Dec 2012 19:48:24 +1100 Received: from RedHat62GAWSWenchao ([9.125.29.43]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qBT8jCUm014358; Sat, 29 Dec 2012 19:48:21 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Sat, 29 Dec 2012 16:45:24 +0800 Message-Id: <1356770725-4804-11-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1356770725-4804-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1356770725-4804-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12122908-5816-0000-0000-0000060A1749 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.2 Cc: kwolf@redhat.com, aliguori@us.ibm.com, phrdina@redhat.com, stefanha@gmail.com, armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH 10/11] hmp: retrieve info from qmp for snapshot info 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 With this patch, hmp command info snapshot simply call a block layer funtion which will return a qmp object, and then translate it in monitor console. Now snapshot info retrieving code in qemu and qemu-tool are merged by calling same block layer function, and then they just translate the qmp to stdout or monitor. Note: This patch need previous hmp extention patch which enable info sub command take qdict * as paramter. Signed-off-by: Wenchao Xia --- savevm.c | 83 ++++++++++++++++++++++++------------------------------------- 1 files changed, 33 insertions(+), 50 deletions(-) diff --git a/savevm.c b/savevm.c index 6884416..5f29316 100644 --- a/savevm.c +++ b/savevm.c @@ -86,6 +86,7 @@ #include "qmp-commands.h" #include "trace.h" #include "qemu/bitops.h" +#include "hmp.h" #define SELF_ANNOUNCE_ROUNDS 5 @@ -2349,68 +2350,50 @@ void do_delvm(Monitor *mon, const QDict *qdict) } } -void do_info_snapshots(Monitor *mon, const QDict *qdict) +/* assume list is valid */ +static void monitor_dump_snapshotinfolist(Monitor *mon, SnapshotInfoList *list) { - BlockDriverState *bs, *bs1; - QEMUSnapshotInfo *sn_tab, *sn, s, *sn_info = &s; - int nb_sns, i, ret, available; - int total; - int *available_snapshots; + SnapshotInfoList *elem; 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; - } + monitor_printf(mon, "%s\n", bdrv_snapshot_dump(buf, sizeof(buf), NULL)); - if (nb_sns == 0) { - monitor_printf(mon, "There is no snapshot available.\n"); - return; + for (elem = list; elem; elem = elem->next) { + QEMUSnapshotInfo sn = { + .vm_state_size = elem->value->vm_state_size, + .date_sec = elem->value->date_sec, + .date_nsec = elem->value->date_nsec, + .vm_clock_nsec = elem->value->vm_clock_sec * 1000000000ULL + + elem->value->vm_clock_nsec, + }; + pstrcpy(sn.id_str, sizeof(sn.id_str), elem->value->id); + pstrcpy(sn.name, sizeof(sn.name), elem->value->name); + monitor_printf(mon, "%s\n", bdrv_snapshot_dump(buf, sizeof(buf), &sn)); } +} - 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); - if (ret < 0) { - available = 0; - break; - } - } - } +static void do_info_snapshots_vm(Monitor *mon) +{ + Error *err = NULL; + SnapshotInfoList *list; - if (available) { - available_snapshots[total] = i; - total++; - } + list = qmp_query_snapshot(&err); + if (error_is_set(&err)) { + hmp_handle_error(mon, &err); + return; } - - 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 { + if (list == NULL) { monitor_printf(mon, "There is no suitable snapshot available\n"); + return; } - g_free(sn_tab); - g_free(available_snapshots); + monitor_dump_snapshotinfolist(mon, list); + return; +} +void do_info_snapshots(Monitor *mon, const QDict *qdict) +{ + do_info_snapshots_vm(mon); } void vmstate_register_ram(MemoryRegion *mr, DeviceState *dev)