[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V4 11/13] hmp: add function hmp_info_snapshots()
From: |
Wenchao Xia |
Subject: |
[Qemu-devel] [PATCH V4 11/13] hmp: add function hmp_info_snapshots() |
Date: |
Thu, 17 Jan 2013 15:40:08 +0800 |
This function will simply call qmp interface qmp_query_snapshots()
added in last commit and then dump information in monitor console.
Now snapshot info retrieving code in qemu and qemu-img are merged
by calling same block layer function, and then they just translate
the qmp object to strings in stdout or monitor console.
Note:
This patch need previous hmp extention patch which enable
info sub command take qdict * as paramter.
Signed-off-by: Wenchao Xia <address@hidden>
---
hmp.c | 42 ++++++++++++++++++++++++++++++++++++++++++
hmp.h | 1 +
2 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/hmp.c b/hmp.c
index c7b6ba0..1e8f9eb 100644
--- a/hmp.c
+++ b/hmp.c
@@ -629,6 +629,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(false, NULL, &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 44be683..b020a7b 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
- [Qemu-devel] [PATCH V4 02/13] block: add bdrv_get_filename() function, (continued)
- [Qemu-devel] [PATCH V4 02/13] block: add bdrv_get_filename() function, Wenchao Xia, 2013/01/17
- [Qemu-devel] [PATCH V4 03/13] block: add bdrv_can_read_snapshot() function, Wenchao Xia, 2013/01/17
- [Qemu-devel] [PATCH V4 04/13] block: add snapshot info query function bdrv_query_snapshot_infolist(), Wenchao Xia, 2013/01/17
- [Qemu-devel] [PATCH V4 05/13] block: add image info query function bdrv_query_image_info(), Wenchao Xia, 2013/01/17
- [Qemu-devel] [PATCH V4 06/13] qemu-img: switch image retrieving function, Wenchao Xia, 2013/01/17
- [Qemu-devel] [PATCH V4 07/13] block: rename bdrv_query_info to bdrv_query_block_info, Wenchao Xia, 2013/01/17
- [Qemu-devel] [PATCH V4 08/13] qmp: add interface query-images., Wenchao Xia, 2013/01/17
- [Qemu-devel] [PATCH V4 09/13] block: export function bdrv_find_snapshot(), Wenchao Xia, 2013/01/17
- [Qemu-devel] [PATCH V4 11/13] hmp: add function hmp_info_snapshots(),
Wenchao Xia <=
- [Qemu-devel] [PATCH V4 10/13] qmp: add interface query-snapshots, Wenchao Xia, 2013/01/17
- [Qemu-devel] [PATCH V4 12/13] hmp: switch snapshot info function to qmp based one, Wenchao Xia, 2013/01/17
- [Qemu-devel] [PATCH V4 13/13] hmp: show snapshots on single block device, Wenchao Xia, 2013/01/17
- Re: [Qemu-devel] [PATCH V4 00/13] add qmp/hmp interfaces for snapshot info, Wenchao Xia, 2013/01/21