From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date: Tue, 27 Mar 2012 16:03:07 +0000 (+0000)
Subject: xen_disk: detach the blkdev before bdrv_delete
X-Git-Tag: qemu-xen-4.2.0~29
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1fb722ad994eb72aeed64adadf59d5758175429c;p=qemu-upstream-4.2-testing.git

xen_disk: detach the blkdev before bdrv_delete

We need to detach the blkdev from the BlockDriverState before calling
bdrv_delete.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---

diff --git a/hw/xen_disk.c b/hw/xen_disk.c
index 286bbac54..285a951d8 100644
--- a/hw/xen_disk.c
+++ b/hw/xen_disk.c
@@ -805,6 +805,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;