From patchwork Sun Jul 25 20:49:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 59881 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 54F7AB6EFE for ; Mon, 26 Jul 2010 07:12:24 +1000 (EST) Received: from localhost ([127.0.0.1]:44068 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Od8Ar-0002h3-Bv for incoming@patchwork.ozlabs.org; Sun, 25 Jul 2010 16:51:53 -0400 Received: from [140.186.70.92] (port=57895 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Od89J-00020g-KE for qemu-devel@nongnu.org; Sun, 25 Jul 2010 16:50:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Od88x-0007Sq-Cx for qemu-devel@nongnu.org; Sun, 25 Jul 2010 16:49:56 -0400 Received: from mail-qy0-f180.google.com ([209.85.216.180]:37296) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Od88x-0007Sh-Ap for qemu-devel@nongnu.org; Sun, 25 Jul 2010 16:49:55 -0400 Received: by qyk8 with SMTP id 8so1442974qyk.4 for ; Sun, 25 Jul 2010 13:49:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:mime-version:received:from:date :message-id:subject:to:content-type; bh=EmolgX4Nr58CPB6QWOMmTB6PLQMJgnBIydPul7rBIrs=; b=uXMMrQ3onrj826ctmr1Qx8jKuQEJVBQxnpXxymGUDYBtJ2oomFC0JY0UeRrlk14drE uSxydjiOmC78lrCt9923WjgKLnVg+dfzBDOE+J3GXCNWiiHgqIevjxbo9y93EkKe/xvX Ap/4rJi5ncxqnPO0C8qwp2cau5gSd7ddnLU6k= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=k1F8n/crIPnAZqi6CsaKE6YIDCFBXabKMmbQAd1h5H5GR9xOH2vsHAcHFIft0g1k0p 9f5I45AgUQOGEB7O67XBlP2IEZGBGc0eSJqAJe2rcb/qutmOhRCP3+7w08M0WWxObC8n M0mCa8o/lpURkvb7tzcpbhNJiBufSqw+yW2zg= Received: by 10.224.11.140 with SMTP id t12mr5354902qat.357.1280090994265; Sun, 25 Jul 2010 13:49:54 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.185.146 with HTTP; Sun, 25 Jul 2010 13:49:34 -0700 (PDT) From: Blue Swirl Date: Sun, 25 Jul 2010 20:49:34 +0000 Message-ID: To: qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH] 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 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 --- 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 f837876..14cfed1 100644 --- a/block.c +++ b/block.c @@ -1800,6 +1800,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;