From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=40798 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUjGQ-00048D-Ei for qemu-devel@nongnu.org; Fri, 02 Jul 2010 12:38:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OUjGP-0001Wl-33 for qemu-devel@nongnu.org; Fri, 02 Jul 2010 12:38:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38327) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OUjGO-0001Wc-Oy for qemu-devel@nongnu.org; Fri, 02 Jul 2010 12:38:53 -0400 From: Kevin Wolf Date: Fri, 2 Jul 2010 18:38:15 +0200 Message-Id: <1278088712-12302-7-git-send-email-kwolf@redhat.com> In-Reply-To: <1278088712-12302-1-git-send-email-kwolf@redhat.com> References: <1278088712-12302-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 06/23] Don't reset bs->is_temporary in bdrv_open_common List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Ryan Harper To fix https://bugs.launchpad.net/qemu/+bug/597402 where qemu fails to call unlink() on temporary snapshots due to bs->is_temporary getting clobbered in bdrv_open_common() after being set in bdrv_open() which calls the former. We don't need to initialize bs->is_temporary in bdrv_open_common(). Signed-off-by: Ryan Harper Signed-off-by: Kevin Wolf --- block.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/block.c b/block.c index 0aaec3b..31ca4c5 100644 --- a/block.c +++ b/block.c @@ -400,7 +400,6 @@ static int bdrv_open_common(BlockDriverState *bs, const char *filename, bs->file = NULL; bs->total_sectors = 0; - bs->is_temporary = 0; bs->encrypted = 0; bs->valid_key = 0; bs->open_flags = flags; -- 1.6.6.1