From: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, phrdina@redhat.com, stefanha@gmail.com,
armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com,
Wenchao Xia <xiawenc@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH V12 15/18] hmp: add function hmp_info_snapshots()
Date: Sat, 13 Apr 2013 16:56:44 +0800 [thread overview]
Message-ID: <1365843407-16504-16-git-send-email-xiawenc@linux.vnet.ibm.com> (raw)
In-Reply-To: <1365843407-16504-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 | 44 ++++++++++++++++++++++++++++++++++++++++++++
hmp.h | 1 +
2 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/hmp.c b/hmp.c
index dbe9b90..cef5eee 100644
--- a/hmp.c
+++ b/hmp.c
@@ -22,6 +22,7 @@
#include "qemu/sockets.h"
#include "monitor/monitor.h"
#include "ui/console.h"
+#include "block/qapi.h"
static void hmp_handle_error(Monitor *mon, Error **errp)
{
@@ -653,6 +654,49 @@ void hmp_info_tpm(Monitor *mon, const QDict *qdict)
qapi_free_TPMInfoList(info_list);
}
+/* assume list is valid */
+static void monitor_dump_snapshotinfolist(Monitor *mon, SnapshotInfoList *list)
+{
+ SnapshotInfoList *elem;
+
+ bdrv_snapshot_dump(NULL);
+ monitor_printf(mon, "\n");
+
+ 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);
+ bdrv_snapshot_dump(&sn);
+ monitor_printf(mon, "\n");
+ }
+}
+
+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 80e8b41..1172c47 100644
--- a/hmp.h
+++ b/hmp.h
@@ -37,6 +37,7 @@ 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_tpm(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
next prev parent reply other threads:[~2013-04-13 9:00 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-13 8:56 [Qemu-devel] [PATCH V12 00/18] qmp/hmp interfaces for internal snapshot info Wenchao Xia
2013-04-13 8:56 ` [Qemu-devel] [PATCH V12 01/18] block: move bdrv_snapshot_find() to block/snapshot.c Wenchao Xia
2013-04-13 8:56 ` [Qemu-devel] [PATCH V12 02/18] block: distinguish id and name in bdrv_find_snapshot() Wenchao Xia
2013-04-17 1:09 ` Eric Blake
2013-04-17 18:50 ` Eric Blake
2013-04-13 8:56 ` [Qemu-devel] [PATCH V12 03/18] qemu-img: remove unused parameter in collect_image_info() Wenchao Xia
2013-04-13 8:56 ` [Qemu-devel] [PATCH V12 04/18] block: move collect_snapshots() and collect_image_info() to block/qapi.c Wenchao Xia
2013-04-13 8:56 ` [Qemu-devel] [PATCH V12 05/18] block: add snapshot info query function bdrv_query_snapshot_info_list() Wenchao Xia
2013-04-13 8:56 ` [Qemu-devel] [PATCH V12 06/18] block: add check for VM snapshot in bdrv_query_snapshot_info_list() Wenchao Xia
2013-04-17 20:52 ` Eric Blake
2013-04-18 4:07 ` Wenchao Xia
2013-04-13 8:56 ` [Qemu-devel] [PATCH V12 07/18] block: change VM snapshot checking logic Wenchao Xia
2013-04-17 21:58 ` Eric Blake
2013-04-13 8:56 ` [Qemu-devel] [PATCH V12 08/18] block: add image info query function bdrv_query_image_info() Wenchao Xia
2013-04-17 22:56 ` Eric Blake
2013-04-13 8:56 ` [Qemu-devel] [PATCH V12 09/18] block: move qmp_query_block() and bdrv_query_info() to block/qapi.c Wenchao Xia
2013-04-13 8:56 ` [Qemu-devel] [PATCH V12 10/18] qmp: add interface query-snapshots Wenchao Xia
2013-04-17 23:03 ` Eric Blake
2013-04-13 8:56 ` [Qemu-devel] [PATCH V12 11/18] qmp: add recursive member in ImageInfo Wenchao Xia
2013-04-13 8:56 ` [Qemu-devel] [PATCH V12 12/18] qmp: add ImageInfo in BlockDeviceInfo used by query-block Wenchao Xia
2013-04-13 8:56 ` [Qemu-devel] [PATCH V12 13/18] block: move bdrv_snapshot_dump() and dump_human_image_info() to block/qapi.c Wenchao Xia
2013-04-13 8:56 ` [Qemu-devel] [PATCH V12 14/18] block: dump to monitor for bdrv_snapshot_dump() and bdrv_image_info_dump() Wenchao Xia
2013-04-16 23:42 ` Eric Blake
2013-04-17 5:25 ` Wenchao Xia
2013-04-13 8:56 ` Wenchao Xia [this message]
2013-04-13 8:56 ` [Qemu-devel] [PATCH V12 16/18] hmp: switch snapshot info function to qmp based one Wenchao Xia
2013-04-13 8:56 ` [Qemu-devel] [PATCH V12 17/18] hmp: show ImageInfo in 'info block' Wenchao Xia
2013-04-13 8:56 ` [Qemu-devel] [PATCH V12 18/18] hmp: add parameters device and -v for info block Wenchao Xia
2013-04-22 2:58 ` [Qemu-devel] [PATCH V12 00/18] qmp/hmp interfaces for internal snapshot info Wenchao Xia
2013-04-22 8:27 ` 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=1365843407-16504-16-git-send-email-xiawenc@linux.vnet.ibm.com \
--to=xiawenc@linux.vnet.ibm.com \
--cc=armbru@redhat.com \
--cc=kwolf@redhat.com \
--cc=lcapitulino@redhat.com \
--cc=pbonzini@redhat.com \
--cc=phrdina@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).