From patchwork Sat Dec 29 08:45:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 208635 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 6428C2C00EC for ; Sat, 29 Dec 2012 20:13:12 +1100 (EST) Received: from localhost ([::1]:35824 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TosTe-0002Yt-Fz for incoming@patchwork.ozlabs.org; Sat, 29 Dec 2012 04:13:10 -0500 Received: from eggs.gnu.org ([208.118.235.92]:59119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tos5d-0005uR-Nq for qemu-devel@nongnu.org; Sat, 29 Dec 2012 03:48:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tos5c-0005QW-F8 for qemu-devel@nongnu.org; Sat, 29 Dec 2012 03:48:21 -0500 Received: from e28smtp05.in.ibm.com ([122.248.162.5]:37324) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tos5b-0005QQ-Qg for qemu-devel@nongnu.org; Sat, 29 Dec 2012 03:48:20 -0500 Received: from /spool/local by e28smtp05.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 29 Dec 2012 14:17:35 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp05.in.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sat, 29 Dec 2012 14:17:33 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 6BD87E004D for ; Sat, 29 Dec 2012 14:18:16 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qBT8mCiD44761114 for ; Sat, 29 Dec 2012 14:18:12 +0530 Received: from d28av02.in.ibm.com (loopback [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qBT8mEgO022167 for ; Sat, 29 Dec 2012 19:48:14 +1100 Received: from RedHat62GAWSWenchao ([9.125.29.43]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qBT8jCUk014358; Sat, 29 Dec 2012 19:48:11 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Sat, 29 Dec 2012 16:45:22 +0800 Message-Id: <1356770725-4804-9-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1356770725-4804-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1356770725-4804-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12122908-8256-0000-0000-0000059EA710 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.5 Cc: kwolf@redhat.com, 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 08/11] qmp: add interface query-snapshot 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. Signed-off-by: Wenchao Xia --- block.c | 32 ++++++++++++++++++++++++++++++++ qapi-schema.json | 12 ++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/block.c b/block.c index d7eb213..ad058f9 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_snapshot(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 40f96f3..2918817 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -731,6 +731,18 @@ { 'command': 'query-image', 'returns': ['ImageInfo'] } ## +# @query-snapshot: +# +# Get a list of valid Snapshots of virtual machine. Note that only valid +# internal snapshot will be returned now, inconsitent one will not be returned. +# +# Returns: a list of @SnapshotInfo describing virtual machine snapshot. +# +# Since: 1.4 +## +{ 'command': 'query-snapshot', 'returns': ['SnapshotInfo'] } + +## # @BlockDeviceStats: # # Statistics of a virtual block device or a block backing device.