From patchwork Sat Apr 13 08:56:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 236311 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 1CDBD2C00A2 for ; Sat, 13 Apr 2013 19:02:12 +1000 (EST) Received: from localhost ([::1]:55747 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQwLa-0002pS-AU for incoming@patchwork.ozlabs.org; Sat, 13 Apr 2013 05:02:10 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQwJw-0000j1-2Z for qemu-devel@nongnu.org; Sat, 13 Apr 2013 05:00:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQwJv-0000qR-0v for qemu-devel@nongnu.org; Sat, 13 Apr 2013 05:00:28 -0400 Received: from e23smtp04.au.ibm.com ([202.81.31.146]:60997) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQwJu-0000pF-GM for qemu-devel@nongnu.org; Sat, 13 Apr 2013 05:00:26 -0400 Received: from /spool/local by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 13 Apr 2013 18:49:01 +1000 Received: from d23dlp03.au.ibm.com (202.81.31.214) by e23smtp04.au.ibm.com (202.81.31.210) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sat, 13 Apr 2013 18:48:59 +1000 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [9.190.234.120]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id CFB0D357804A for ; Sat, 13 Apr 2013 19:00:22 +1000 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r3D8kViJ1245506 for ; Sat, 13 Apr 2013 18:46:31 +1000 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r3D8xq8Y027280 for ; Sat, 13 Apr 2013 18:59:52 +1000 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.157]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r3D8u24J020091; Sat, 13 Apr 2013 18:59:50 +1000 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Sat, 13 Apr 2013 16:56:35 +0800 Message-Id: <1365843407-16504-7-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1365843407-16504-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1365843407-16504-1-git-send-email-xiawenc@linux.vnet.ibm.com> x-cbid: 13041308-9264-0000-0000-000003824347 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.146 Cc: kwolf@redhat.com, phrdina@redhat.com, stefanha@gmail.com, armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V12 06/18] 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. Note that the snapshot check logic is copied from do_info_snapshots(), which is different with load_vmstate() and will be changed in next patch. 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 | 2 +- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index 9bfa547..97c5cd4 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -23,15 +23,48 @@ */ #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; +} + +/* * Returns 0 on success, with *p_list either set to describe snapshot * information, or NULL because there are no snapshots. Returns -errno on - * error, with *p_list untouched. + * error, with *p_list untouched. 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; @@ -60,7 +93,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 472b264..f537014 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1735,7 +1735,7 @@ static ImageInfoList *collect_image_info_list(const char *filename, info = g_new0(ImageInfo, 1); bdrv_collect_image_info(bs, info, filename); - bdrv_query_snapshot_info_list(bs, &info->snapshots, NULL); + bdrv_query_snapshot_info_list(bs, &info->snapshots, false, NULL); if (info->snapshots) { info->has_snapshots = true; }