From patchwork Sat Apr 17 09:49:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 50379 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 9CD4EB7D06 for ; Sat, 17 Apr 2010 19:56:18 +1000 (EST) Received: from localhost ([127.0.0.1]:34736 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O34iu-0002Zj-AX for incoming@patchwork.ozlabs.org; Sat, 17 Apr 2010 05:54:00 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O34dt-0001SZ-KH for qemu-devel@nongnu.org; Sat, 17 Apr 2010 05:48:49 -0400 Received: from [140.186.70.92] (port=59505 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O34ds-0001SB-3n for qemu-devel@nongnu.org; Sat, 17 Apr 2010 05:48:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O34dn-0003TY-Sw for qemu-devel@nongnu.org; Sat, 17 Apr 2010 05:48:47 -0400 Received: from mtagate3.uk.ibm.com ([194.196.100.163]:37000) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O34dn-0003TG-LB for qemu-devel@nongnu.org; Sat, 17 Apr 2010 05:48:43 -0400 Received: from d06nrmr1806.portsmouth.uk.ibm.com (d06nrmr1806.portsmouth.uk.ibm.com [9.149.39.193]) by mtagate3.uk.ibm.com (8.13.1/8.13.1) with ESMTP id o3H9mf4P025321 for ; Sat, 17 Apr 2010 09:48:41 GMT Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by d06nrmr1806.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o3H9mfrs1245262 for ; Sat, 17 Apr 2010 10:48:41 +0100 Received: from d06av04.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id o3H9mfkt007213 for ; Sat, 17 Apr 2010 10:48:41 +0100 Received: from localhost.localdomain (sig-9-145-161-33.de.ibm.com [9.145.161.33]) by d06av04.portsmouth.uk.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id o3H9meNZ007210; Sat, 17 Apr 2010 10:48:40 +0100 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Sat, 17 Apr 2010 10:49:06 +0100 Message-Id: <1271497747-4463-1-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Kevin Wolf , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 1/2] 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 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 --- block.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/block.c b/block.c index 12cf434..e7e74d9 100644 --- a/block.c +++ b/block.c @@ -523,8 +523,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