From patchwork Tue Feb 26 10:40:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 223216 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 BB2F72C0326 for ; Tue, 26 Feb 2013 23:49:42 +1100 (EST) Received: from localhost ([::1]:40141 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAJyW-0001gv-5p for incoming@patchwork.ozlabs.org; Tue, 26 Feb 2013 07:49:40 -0500 Received: from eggs.gnu.org ([208.118.235.92]:58321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAJyO-0001gc-4z for qemu-devel@nongnu.org; Tue, 26 Feb 2013 07:49:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UAJyJ-0001l3-40 for qemu-devel@nongnu.org; Tue, 26 Feb 2013 07:49:32 -0500 Received: from e23smtp02.au.ibm.com ([202.81.31.144]:50632) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAI0M-0003rP-St for qemu-devel@nongnu.org; Tue, 26 Feb 2013 05:43:27 -0500 Received: from /spool/local by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 26 Feb 2013 20:37:09 +1000 Received: from d23dlp02.au.ibm.com (202.81.31.213) by e23smtp02.au.ibm.com (202.81.31.208) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 26 Feb 2013 20:37:07 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id A9B0A2BB0050 for ; Tue, 26 Feb 2013 21:43:22 +1100 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r1QAUk1p4981142 for ; Tue, 26 Feb 2013 21:30:46 +1100 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r1QAhLpr016384 for ; Tue, 26 Feb 2013 21:43:21 +1100 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.152]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r1QAeKOG012693; Tue, 26 Feb 2013 21:43:19 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Tue, 26 Feb 2013 18:40:25 +0800 Message-Id: <1361875228-15769-12-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1361875228-15769-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1361875228-15769-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13022610-5490-0000-0000-0000030623E9 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.144 Cc: kwolf@redhat.com, aliguori@us.ibm.com, stefanha@gmail.com, armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V7 11/14] qmp: add interface query-snapshots 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 This interface now return valid internal snapshots for whole vm. Note that filter use bdrv_can_read_snapshot() instead of bdrv_can_snapshot(), which should be the correct behavior in information retrieving funtion. Signed-off-by: Wenchao Xia --- block.c | 32 ++++++++++++++++++++++++++++++++ qapi-schema.json | 14 ++++++++++++++ qmp-commands.hx | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 99 insertions(+), 0 deletions(-) diff --git a/block.c b/block.c index dd2259a..6bda890 100644 --- a/block.c +++ b/block.c @@ -2880,6 +2880,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_read_snapshot(bs1) && bs1 != bs) { + ret = bdrv_snapshot_find(bs1, sn_info, sn->id_str, NULL); + if (ret < 0) { + ret = -1; + break; + } + } + } + return ret; +} + +SnapshotInfoList *qmp_query_snapshots(Error **errp) +{ + BlockDriverState *bs; + + /* internal snapshot for whole vm */ + 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 9122bb9..8a9a052 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -823,6 +823,20 @@ 'returns': ['DeviceImageInfo'] } ## +# @query-snapshots: +# +# Get a list of internal snapshots for whole virtual machine, only valid +# internal snapshot will be returned, inconsistent ones will be ignored. +# +# Returns: a list of @SnapshotInfo describing all consistent virtual machine +# snapshots +# +# Since: 1.5 +## +{ '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 292d61e..3a5f9bb 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1819,6 +1819,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 in bytes (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": 34000000, + "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 ----------------