From patchwork Wed Jan 9 05:12:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 210624 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 5D6C92C00C8 for ; Wed, 9 Jan 2013 16:50:26 +1100 (EST) Received: from localhost ([::1]:36206 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tso0Z-0007n4-Pi for incoming@patchwork.ozlabs.org; Wed, 09 Jan 2013 00:15:23 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55342) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tso09-00077d-7m for qemu-devel@nongnu.org; Wed, 09 Jan 2013 00:14:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tso07-0008Pq-P1 for qemu-devel@nongnu.org; Wed, 09 Jan 2013 00:14:57 -0500 Received: from e28smtp08.in.ibm.com ([122.248.162.8]:35717) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tso05-0008Pb-9d for qemu-devel@nongnu.org; Wed, 09 Jan 2013 00:14:55 -0500 Received: from /spool/local by e28smtp08.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 9 Jan 2013 10:43:13 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp08.in.ibm.com (192.168.1.138) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 9 Jan 2013 10:43:10 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 88335E004B for ; Wed, 9 Jan 2013 10:45:01 +0530 (IST) Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r095Elis46661744 for ; Wed, 9 Jan 2013 10:44:47 +0530 Received: from d28av04.in.ibm.com (loopback [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r095El8s020543 for ; Wed, 9 Jan 2013 16:14:48 +1100 Received: from RH63Wenchao ([9.77.181.189]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r095Ch6C014023; Wed, 9 Jan 2013 16:14:44 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Wed, 9 Jan 2013 13:12:27 +0800 Message-Id: <1357708350-9917-9-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1357708350-9917-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1357708350-9917-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13010905-2000-0000-0000-00000A875F27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.8 Cc: aliguori@us.ibm.com, phrdina@redhat.com, stefanha@gmail.com, armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V2 08/11] 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. 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 --- 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 ----------------