From patchwork Tue Mar 27 16:15:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 148989 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 408A6B6EEA for ; Wed, 28 Mar 2012 03:14:48 +1100 (EST) Received: from localhost ([::1]:50550 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCZ2j-0000BF-Uf for incoming@patchwork.ozlabs.org; Tue, 27 Mar 2012 12:14:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37759) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCZ2Y-0008Ts-RZ for qemu-devel@nongnu.org; Tue, 27 Mar 2012 12:14:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SCZ2S-0003zM-Nw for qemu-devel@nongnu.org; Tue, 27 Mar 2012 12:14:34 -0400 Received: from smtp.citrix.com ([66.165.176.89]:47387) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCZ2L-0003xL-4N; Tue, 27 Mar 2012 12:14:21 -0400 X-IronPort-AV: E=Sophos;i="4.75,327,1330923600"; d="scan'208";a="23551377" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 27 Mar 2012 12:14:18 -0400 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.213.0; Tue, 27 Mar 2012 12:14:18 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1SCZ2I-0001DX-5b; Tue, 27 Mar 2012 17:14:18 +0100 From: Stefano Stabellini To: anthony@codemonkey.ws Date: Tue, 27 Mar 2012 17:15:32 +0100 Message-ID: <1332864932-1082-2-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.89 Cc: Stefano Stabellini , qemu-devel@nongnu.org, qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 2/2] xen_disk: detach the blkdev before bdrv_delete X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We need to detach the blkdev from the BlockDriverState before calling bdrv_delete. Signed-off-by: Stefano Stabellini --- hw/xen_disk.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/xen_disk.c b/hw/xen_disk.c index 68fa36a..bf06fc1 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -726,6 +726,7 @@ static void blk_disconnect(struct XenDevice *xendev) if (!blkdev->dinfo) { /* close/delete only if we created it ourself */ bdrv_close(blkdev->bs); + bdrv_detach_dev(blkdev->bs, blkdev); bdrv_delete(blkdev->bs); } blkdev->bs = NULL;