From patchwork Tue Apr 2 11:47:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 232978 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 09C0E2C0139 for ; Tue, 2 Apr 2013 22:54:26 +1100 (EST) Received: from localhost ([::1]:59327 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMznE-0000D2-4X for incoming@patchwork.ozlabs.org; Tue, 02 Apr 2013 07:54:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49132) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMziz-0002X4-QQ for qemu-devel@nongnu.org; Tue, 02 Apr 2013 07:50:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UMziw-0003e1-Be for qemu-devel@nongnu.org; Tue, 02 Apr 2013 07:50:01 -0400 Received: from e28smtp01.in.ibm.com ([122.248.162.1]:46172) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMziv-0003dN-IU for qemu-devel@nongnu.org; Tue, 02 Apr 2013 07:49:58 -0400 Received: from /spool/local by e28smtp01.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 2 Apr 2013 17:15:46 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp01.in.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 2 Apr 2013 17:15:44 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 369AC394002D for ; Tue, 2 Apr 2013 17:19:53 +0530 (IST) Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r32BnnwK4456760 for ; Tue, 2 Apr 2013 17:19:50 +0530 Received: from d28av01.in.ibm.com (loopback [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r32Bnpjd002727 for ; Tue, 2 Apr 2013 11:49:52 GMT Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.29]) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r32BlY37025943; Tue, 2 Apr 2013 11:49:50 GMT From: Wenchao Xia To: qemu-devel@nongnu.org Date: Tue, 2 Apr 2013 19:47:19 +0800 Message-Id: <1364903250-10429-7-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1364903250-10429-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1364903250-10429-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13040211-4790-0000-0000-000007AAB9CE X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.1 Cc: kwolf@redhat.com, stefanha@gmail.com, armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V11 06/17] block: add check for VM snapshot in bdrv_query_snapshot_info_list() 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 patch adds a parameter to tell whether return valid snapshots for whole VM only. Signed-off-by: Wenchao Xia Reviewed-by: Eric Blake Reviewed-by: Kevin Wolf --- block/qapi.c | 39 +++++++++++++++++++++++++++++++++++++-- include/block/qapi.h | 1 + qemu-img.c | 3 ++- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index 03369a5..19d4d93 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -23,14 +23,47 @@ */ #include "block/qapi.h" +#include "block/snapshot.h" #include "block/block_int.h" /* + * check whether the snapshot is valid for whole vm. + * + * @sn: snapshot info to be checked. + * @bs: where @sn was found. + * + * return true if the snapshot is consistent for the VM. + */ +static bool snapshot_valid_for_vm(const QEMUSnapshotInfo *sn, + BlockDriverState *bs) +{ + BlockDriverState *bs1 = NULL; + QEMUSnapshotInfo s, *sn_info = &s; + int ret; + + /* Check logic is connected with load_vmstate(): + Only check the devices that can snapshot, other devices that can't + take snapshot, for example, readonly ones, will be ignored in + load_vmstate(). */ + while ((bs1 = bdrv_next(bs1))) { + if (bs1 != bs && bdrv_can_snapshot(bs1)) { + ret = bdrv_snapshot_find(bs1, sn_info, sn->id_str, NULL); + if (ret < 0) { + return false; + } + } + } + return true; +} + +/* * return 0 on success, @p_list will be set only on success, and caller need to - * check *p_list on success. + * check *p_list on success. If @vm_snapshot is true, limit the results to + * snapshots valid for the whole VM. */ int bdrv_query_snapshot_info_list(BlockDriverState *bs, SnapshotInfoList **p_list, + bool vm_snapshot, Error **errp) { int i, sn_count; @@ -59,7 +92,9 @@ int bdrv_query_snapshot_info_list(BlockDriverState *bs, } for (i = 0; i < sn_count; i++) { - + if (vm_snapshot && !snapshot_valid_for_vm(&sn_tab[i], bs)) { + continue; + } info = g_new0(SnapshotInfo, 1); info->id = g_strdup(sn_tab[i].id_str); info->name = g_strdup(sn_tab[i].name); diff --git a/include/block/qapi.h b/include/block/qapi.h index 91dc41b..fe66053 100644 --- a/include/block/qapi.h +++ b/include/block/qapi.h @@ -30,6 +30,7 @@ int bdrv_query_snapshot_info_list(BlockDriverState *bs, SnapshotInfoList **p_list, + bool vm_snapshot, Error **errp); void bdrv_collect_image_info(BlockDriverState *bs, ImageInfo *info, diff --git a/qemu-img.c b/qemu-img.c index 51043ef..261c277 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1735,7 +1735,8 @@ static ImageInfoList *collect_image_info_list(const char *filename, info = g_new0(ImageInfo, 1); bdrv_collect_image_info(bs, info, filename); - if (!bdrv_query_snapshot_info_list(bs, &info->snapshots, NULL) && + if (!bdrv_query_snapshot_info_list(bs, &info->snapshots, + false, NULL) && info->snapshots) { info->has_snapshots = true; }