From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:52332) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqT2W-0003Lc-3v for qemu-devel@nongnu.org; Thu, 26 Jan 2012 12:23:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RqT2N-0003ET-Ht for qemu-devel@nongnu.org; Thu, 26 Jan 2012 12:23:12 -0500 Received: from mail-iy0-f173.google.com ([209.85.210.173]:60416) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqT2N-0003D7-9c for qemu-devel@nongnu.org; Thu, 26 Jan 2012 12:23:03 -0500 Received: by mail-iy0-f173.google.com with SMTP id k25so1227300iah.4 for ; Thu, 26 Jan 2012 09:23:03 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 26 Jan 2012 18:22:32 +0100 Message-Id: <1327598569-5199-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1327598569-5199-1-git-send-email-pbonzini@redhat.com> References: <1327598569-5199-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 01/18] block: do not rely on open_flags for bdrv_is_snapshot List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com The BDRV_O_SNAPSHOT flag is stored in open_flags but not passed to bdrv_open. This makes the usage of bs->open_flags wrong in bdrv_snapshot_goto. (Instead, bdrv_commit uses the backing file's open_flags and those flags never include any of BDRV_O_SNAPSHOT, BDRV_O_NO_BACKING or BDRV_O_RDWR). We will fix the open_flags soon. In the meanwhile, do not rely on the fact that BDRV_O_SNAPSHOT is stored in open_flags. Signed-off-by: Paolo Bonzini --- block.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/block.c b/block.c index 3621d11..c5a85a2 100644 --- a/block.c +++ b/block.c @@ -2494,7 +2494,7 @@ int bdrv_can_snapshot(BlockDriverState *bs) int bdrv_is_snapshot(BlockDriverState *bs) { - return !!(bs->open_flags & BDRV_O_SNAPSHOT); + return bs->is_temporary; } BlockDriverState *bdrv_snapshots(void) -- 1.7.7.6