From patchwork Fri Apr 30 14:00:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 51339 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 3C933B6F11 for ; Sat, 1 May 2010 00:21:19 +1000 (EST) Received: from localhost ([127.0.0.1]:54400 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O7r4E-00055I-PY for incoming@patchwork.ozlabs.org; Fri, 30 Apr 2010 10:19:46 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O7qnH-0007Sm-TR for qemu-devel@nongnu.org; Fri, 30 Apr 2010 10:02:16 -0400 Received: from [140.186.70.92] (port=55199 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O7qnF-0007QB-CN for qemu-devel@nongnu.org; Fri, 30 Apr 2010 10:02:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O7qnD-0000RT-Mo for qemu-devel@nongnu.org; Fri, 30 Apr 2010 10:02:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:8447) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O7qnD-0000RE-F4 for qemu-devel@nongnu.org; Fri, 30 Apr 2010 10:02:11 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o3UE25Ad009992 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 30 Apr 2010 10:02:05 -0400 Received: from localhost.localdomain (vpn1-6-55.ams2.redhat.com [10.36.6.55]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3UE14s8007196; Fri, 30 Apr 2010 10:02:02 -0400 From: Kevin Wolf To: aliguori@linux.vnet.ibm.com Date: Fri, 30 Apr 2010 16:00:31 +0200 Message-Id: <1272636040-17374-10-git-send-email-kwolf@redhat.com> In-Reply-To: <1272636040-17374-1-git-send-email-kwolf@redhat.com> References: <1272636040-17374-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 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 09/18] block: Set backing_hd to NULL after deleting it 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: Stefan Hajnoczi It is safer to set backing_hd to NULL after deleting it so that any use after deletion is obvious during development. Happy segfaulting! This patch should be applied after Kevin Wolf's "vmdk: Convert to bdrv_open" so that vmdk does not segfault on close. Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- block.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/block.c b/block.c index 56835af..b318355 100644 --- a/block.c +++ b/block.c @@ -589,8 +589,10 @@ unlink_and_fail: void bdrv_close(BlockDriverState *bs) { if (bs->drv) { - if (bs->backing_hd) + if (bs->backing_hd) { bdrv_delete(bs->backing_hd); + bs->backing_hd = NULL; + } bs->drv->bdrv_close(bs); qemu_free(bs->opaque); #ifdef _WIN32