]> xenbits.xensource.com Git - qemu-upstream-4.3-testing.git/commitdiff
xen_disk: detach the blkdev before bdrv_delete
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>
Tue, 27 Mar 2012 16:03:07 +0000 (16:03 +0000)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>
Wed, 11 Apr 2012 13:50:52 +0000 (13:50 +0000)
We need to detach the blkdev from the BlockDriverState before calling
bdrv_delete.

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

index 286bbac54a198d3b22377c77451b432e06ae76cb..285a951d879fd790ebf8f6ef6694c4b4083b4a85 100644 (file)
@@ -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;