[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V2 08/11] qmp: add interface query-snapshots
From: |
Wenchao Xia |
Subject: |
[Qemu-devel] [PATCH V2 08/11] qmp: add interface query-snapshots |
Date: |
Wed, 9 Jan 2013 13:12:27 +0800 |
This interface now return valid internal snapshots.
v2:
Better tips and spelling fix in qmp-schema.json.
Change name to plurals.
Add counter part in qmp-commands.hx.
Signed-off-by: Wenchao Xia <address@hidden>
---
block.c | 32 ++++++++++++++++++++++++++++++++
qapi-schema.json | 13 +++++++++++++
qmp-commands.hx | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 98 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index b7d2f03..990a07f 100644
--- a/block.c
+++ b/block.c
@@ -2892,6 +2892,38 @@ SnapshotInfoList
*bdrv_query_snapshot_infolist(BlockDriverState *bs,
return head;
}
+/* check if sn exist on all block devices, 0 means valid */
+static int snapshot_filter_vm(const QEMUSnapshotInfo *sn, void *opaque)
+{
+ BlockDriverState *bs = (BlockDriverState *)opaque, *bs1 = NULL;
+ QEMUSnapshotInfo s, *sn_info = &s;
+ int ret = 0;
+
+ 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) {
+ ret = -1;
+ break;
+ }
+ }
+ }
+ return ret;
+}
+
+SnapshotInfoList *qmp_query_snapshots(Error **errp)
+{
+ BlockDriverState *bs;
+
+ bs = bdrv_snapshots();
+ if (!bs) {
+ error_setg(errp, "No available block device supports snapshots\n");
+ return NULL;
+ }
+
+ return bdrv_query_snapshot_infolist(bs, snapshot_filter_vm, bs, errp);
+}
+
/* collect all internal snapshot info in a image for ImageInfo */
static void collect_snapshots_info(BlockDriverState *bs,
ImageInfo *info,
diff --git a/qapi-schema.json b/qapi-schema.json
index 5fe6dc1..8b78fa6 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -747,6 +747,19 @@
{ 'command': 'query-images', 'returns': ['DeviceImageInfo'] }
##
+# @query-snapshots:
+#
+# Get a list of valid snapshots of virtual machine. Note that only valid
+# internal snapshot will be returned, inconsistent ones will not be returned.
+#
+# Returns: a list of @SnapshotInfo describing all consistent virtual machine
+# snapshots.
+#
+# Since: 1.4
+##
+{ 'command': 'query-snapshots', 'returns': ['SnapshotInfo'] }
+
+##
# @BlockDeviceStats:
#
# Statistics of a virtual block device or a block backing device.
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 3c95a48..1ff4ff7 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -1744,6 +1744,59 @@ EQMP
},
SQMP
+query-snapshots
+-----------
+
+Show the internal consistent snapshot information.
+
+Each snapshot information is stored in a json-object and the returned value
+is a json-array of all snapshots.
+
+Each json-object contain the following:
+
+- "id": unique snapshot id (json-string)
+- "name": internal snapshot name (json-string)
+- "vm-state-size": size of the VM state (json-int)
+- "date-sec": UTC date of the snapshot in seconds (json-int)
+- "date-nsec": fractional part in nano seconds to be used with
date-sec(json-int)
+- "vm-clock-sec": VM clock relative to boot in seconds (json-int)
+- "vm-clock-nsec": fractional part in nano seconds to be used with
vm-clock-sec (json-int)
+
+Example:
+
+-> { "execute": "query-snapshots" }
+<- {
+ "return":[
+ {
+ "id": "1",
+ "name": "snapshot1",
+ "vm-state-size": 0,
+ "date-sec": 10000200,
+ "date-nsec": 12,
+ "vm-clock-sec": 206,
+ "vm-clock-nsec": 30
+ },
+ {
+ "id": "2",
+ "name": "snapshot2",
+ "vm-state-size": 24000,
+ "date-sec": 13000200,
+ "date-nsec": 32,
+ "vm-clock-sec": 406,
+ "vm-clock-nsec": 31
+ }
+ ]
+ }
+
+EQMP
+
+ {
+ .name = "query-snapshots",
+ .args_type = "",
+ .mhandler.cmd_new = qmp_marshal_input_query_snapshots,
+ },
+
+SQMP
query-blockstats
----------------
--
1.7.1
- [Qemu-devel] [PATCH V2 01/11] qemu-img: remove unused parameter in collect_image_info(), (continued)
[Qemu-devel] [PATCH V2 04/11] qemu-img: switch image retrieving function, Wenchao Xia, 2013/01/09
[Qemu-devel] [PATCH V2 07/11] block: export function bdrv_find_snapshot(), Wenchao Xia, 2013/01/09
[Qemu-devel] [PATCH V2 02/11] block: add bdrv_get_filename() function, Wenchao Xia, 2013/01/09
[Qemu-devel] [PATCH V2 08/11] qmp: add interface query-snapshots,
Wenchao Xia <=
[Qemu-devel] [PATCH V2 05/11] block: rename bdrv_query_info to bdrv_query_block_info, Wenchao Xia, 2013/01/09
[Qemu-devel] [PATCH V2 09/11] hmp: export function hmp_handle_error(), Wenchao Xia, 2013/01/09
[Qemu-devel] [PATCH V2 06/11] qmp: add interface query-images., Wenchao Xia, 2013/01/09
[Qemu-devel] [PATCH V2 10/11] hmp: retrieve info from qmp for snapshot info, Wenchao Xia, 2013/01/09
[Qemu-devel] [PATCH V2 11/11] hmp: show snapshot on single block device, Wenchao Xia, 2013/01/09