All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
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 <xiawenc@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH V8 12/20] hmp: add function hmp_info_snapshots()
Date: Thu,  7 Mar 2013 14:07:17 +0800	[thread overview]
Message-ID: <1362636445-7188-13-git-send-email-xiawenc@linux.vnet.ibm.com> (raw)
In-Reply-To: <1362636445-7188-1-git-send-email-xiawenc@linux.vnet.ibm.com>

  This function will simply call qmp interface qmp_query_snapshots()
added in last commit and then dump information in monitor console.
  To get snapshot info, Now qemu and qemu-img both call block layer
function bdrv_query_snapshot_info_list() in their calling path, and
then they just translate the qmp object got to strings in stdout or
monitor console.

Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
---
 hmp.c |   42 ++++++++++++++++++++++++++++++++++++++++++
 hmp.h |    1 +
 2 files changed, 43 insertions(+), 0 deletions(-)

diff --git a/hmp.c b/hmp.c
index 2f47a8a..34f0691 100644
--- a/hmp.c
+++ b/hmp.c
@@ -607,6 +607,48 @@ void hmp_info_block_jobs(Monitor *mon, const QDict *qdict)
     }
 }
 
+/* assume list is valid */
+static void monitor_dump_snapshotinfolist(Monitor *mon, SnapshotInfoList *list)
+{
+    SnapshotInfoList *elem;
+    char buf[256];
+
+    monitor_printf(mon, "%s\n", bdrv_snapshot_dump(buf, sizeof(buf), NULL));
+
+    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));
+    }
+}
+
+void hmp_info_snapshots(Monitor *mon, const QDict *qdict)
+{
+    Error *err = NULL;
+    SnapshotInfoList *list;
+
+    list = qmp_query_snapshots(&err);
+    if (error_is_set(&err)) {
+        hmp_handle_error(mon, &err);
+        return;
+    }
+
+    if (list == NULL) {
+        monitor_printf(mon, "There is no suitable snapshot available\n");
+        return;
+    }
+
+    monitor_dump_snapshotinfolist(mon, list);
+    qapi_free_SnapshotInfoList(list);
+}
+
 void hmp_quit(Monitor *mon, const QDict *qdict)
 {
     monitor_suspend(mon);
diff --git a/hmp.h b/hmp.h
index 30b3c20..0b0ae13 100644
--- a/hmp.h
+++ b/hmp.h
@@ -36,6 +36,7 @@ void hmp_info_spice(Monitor *mon, const QDict *qdict);
 void hmp_info_balloon(Monitor *mon, const QDict *qdict);
 void hmp_info_pci(Monitor *mon, const QDict *qdict);
 void hmp_info_block_jobs(Monitor *mon, const QDict *qdict);
+void hmp_info_snapshots(Monitor *mon, const QDict *qdict);
 void hmp_quit(Monitor *mon, const QDict *qdict);
 void hmp_stop(Monitor *mon, const QDict *qdict);
 void hmp_system_reset(Monitor *mon, const QDict *qdict);
-- 
1.7.1

  parent reply	other threads:[~2013-03-07  6:10 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-07  6:07 [Qemu-devel] [PATCH V8 00/20] qmp/hmp interfaces for internal snapshot info Wenchao Xia
2013-03-07  6:07 ` [Qemu-devel] [PATCH V8 01/20] build: add block/snapshot.c Wenchao Xia
2013-03-08 20:18   ` Eric Blake
2013-03-09  4:00     ` Wenchao Xia
2013-03-09 13:10       ` Eric Blake
2013-03-07  6:07 ` [Qemu-devel] [PATCH V8 02/20] build: add block/qapi.c Wenchao Xia
2013-03-08 20:22   ` Eric Blake
2013-03-09  4:05     ` Wenchao Xia
2013-03-07  6:07 ` [Qemu-devel] [PATCH V8 03/20] block: move bdrv_snapshot_find() to block/snapshot.c Wenchao Xia
2013-03-08 20:27   ` Eric Blake
2013-03-09  4:17     ` Wenchao Xia
2013-03-07  6:07 ` [Qemu-devel] [PATCH V8 04/20] block: distinguish id and name in bdrv_find_snapshot() Wenchao Xia
2013-03-07  6:07 ` [Qemu-devel] [PATCH V8 05/20] qemu-img: remove unused parameter in collect_image_info() Wenchao Xia
2013-03-08 20:34   ` Eric Blake
2013-03-09  4:18     ` Wenchao Xia
2013-03-07  6:07 ` [Qemu-devel] [PATCH V8 06/20] block: move collect_snapshots() and collect_image_info() to block/qapi.c Wenchao Xia
2013-03-08 22:04   ` Eric Blake
2013-03-09  4:20     ` Wenchao Xia
2013-03-07  6:07 ` [Qemu-devel] [PATCH V8 07/20] block: add snapshot info query function bdrv_query_snapshot_info_list() Wenchao Xia
2013-03-08 22:15   ` Eric Blake
2013-03-07  6:07 ` [Qemu-devel] [PATCH V8 08/20] block: add filter for vm snapshot in bdrv_query_snapshot_info_list() Wenchao Xia
2013-03-08 22:55   ` Eric Blake
2013-03-09  4:24     ` Wenchao Xia
2013-03-07  6:07 ` [Qemu-devel] [PATCH V8 09/20] block: add image info query function bdrv_query_image_info() Wenchao Xia
2013-03-08 23:08   ` Eric Blake
2013-03-09  4:26     ` Wenchao Xia
2013-03-07  6:07 ` [Qemu-devel] [PATCH V8 10/20] qmp: add interface query-snapshots Wenchao Xia
2013-03-08 23:30   ` Eric Blake
2013-03-09  4:28     ` Wenchao Xia
2013-03-07  6:07 ` [Qemu-devel] [PATCH V8 11/20] qmp: add interface query-images Wenchao Xia
2013-03-07  6:07 ` Wenchao Xia [this message]
2013-03-07  6:07 ` [Qemu-devel] [PATCH V8 13/20] hmp: switch snapshot info function to qmp based one Wenchao Xia
2013-03-07  6:07 ` [Qemu-devel] [PATCH V8 14/20] block: move dump_human_image_info() to block/qapi.c Wenchao Xia
2013-03-07  6:07 ` [Qemu-devel] [PATCH V8 15/20] block: dump to buffer for bdrv_image_info_dump() Wenchao Xia
2013-03-07  6:07 ` [Qemu-devel] [PATCH V8 16/20] hmp: add command info images Wenchao Xia
2013-03-07  6:07 ` [Qemu-devel] [PATCH V8 17/20] block: return bool for bdrv_can_snapshot() Wenchao Xia
2013-03-07  6:07 ` [Qemu-devel] [PATCH V8 18/20] block: move snapshot related functions to block/snapshot.c Wenchao Xia
2013-03-07  6:07 ` [Qemu-devel] [PATCH V8 19/20] block: move bdrv_snapshot_dump() to block/qapi.c Wenchao Xia
2013-03-07  6:07 ` [Qemu-devel] [PATCH V8 20/20] block: rename bdrv_query_info() to bdrv_query_block_info() Wenchao Xia
2013-03-07  7:36 ` [Qemu-devel] [PATCH V8 00/20] qmp/hmp interfaces for internal snapshot info Markus Armbruster
2013-03-11  1:24   ` Wenchao Xia
2013-03-11  8:34     ` Markus Armbruster

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1362636445-7188-13-git-send-email-xiawenc@linux.vnet.ibm.com \
    --to=xiawenc@linux.vnet.ibm.com \
    --cc=aliguori@us.ibm.com \
    --cc=armbru@redhat.com \
    --cc=capitulino@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.