From patchwork Mon Jul 26 14:01:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 59920 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F04F9B70A6 for ; Tue, 27 Jul 2010 00:10:52 +1000 (EST) Received: from localhost ([127.0.0.1]:38100 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OdOOH-0008Fa-3C for incoming@patchwork.ozlabs.org; Mon, 26 Jul 2010 10:10:49 -0400 Received: from [140.186.70.92] (port=49950 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OdOFN-0002Oa-Ml for qemu-devel@nongnu.org; Mon, 26 Jul 2010 10:01:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OdOFD-0005RM-Lx for qemu-devel@nongnu.org; Mon, 26 Jul 2010 10:01:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47113) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OdOFD-0005R9-FJ for qemu-devel@nongnu.org; Mon, 26 Jul 2010 10:01:27 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o6QE1PKB023910 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 26 Jul 2010 10:01:25 -0400 Received: from dhcp-5-188.str.redhat.com (dhcp-5-175.str.redhat.com [10.32.5.175]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o6QE1FeX021114; Mon, 26 Jul 2010 10:01:24 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Mon, 26 Jul 2010 16:01:17 +0200 Message-Id: <1280152877-29037-8-git-send-email-kwolf@redhat.com> In-Reply-To: <1280152877-29037-1-git-send-email-kwolf@redhat.com> References: <1280152877-29037-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 7/7] Fix -snapshot deleting images on disk change X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Blue Swirl Block device change command did not copy BDRV_O_SNAPSHOT flag. Thus the new image did not have this flag and the file got deleted during opening. Fix by copying BDRV_O_SNAPSHOT flag. Signed-off-by: Blue Swirl Signed-off-by: Kevin Wolf --- block.c | 5 +++++ block.h | 1 + blockdev.c | 1 + 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/block.c b/block.c index 49e6cbc..452ae94 100644 --- a/block.c +++ b/block.c @@ -1811,6 +1811,11 @@ int bdrv_can_snapshot(BlockDriverState *bs) return 1; } +int bdrv_is_snapshot(BlockDriverState *bs) +{ + return !!(bs->open_flags & BDRV_O_SNAPSHOT); +} + BlockDriverState *bdrv_snapshots(void) { BlockDriverState *bs; diff --git a/block.h b/block.h index c2a7e4c..db131a3 100644 --- a/block.h +++ b/block.h @@ -202,6 +202,7 @@ const char *bdrv_get_encrypted_filename(BlockDriverState *bs); void bdrv_get_backing_filename(BlockDriverState *bs, char *filename, int filename_size); int bdrv_can_snapshot(BlockDriverState *bs); +int bdrv_is_snapshot(BlockDriverState *bs); BlockDriverState *bdrv_snapshots(void); int bdrv_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info); diff --git a/blockdev.c b/blockdev.c index 0a9dec3..01e402b 100644 --- a/blockdev.c +++ b/blockdev.c @@ -590,6 +590,7 @@ int do_change_block(Monitor *mon, const char *device, return -1; } bdrv_flags = bdrv_is_read_only(bs) ? 0 : BDRV_O_RDWR; + bdrv_flags |= bdrv_is_snapshot(bs) ? BDRV_O_SNAPSHOT : 0; if (bdrv_open(bs, filename, bdrv_flags, drv) < 0) { qerror_report(QERR_OPEN_FILE_FAILED, filename); return -1;