[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 7/8] xen_disk: simplify blk_disconnect with refc
From: |
Jeff Cody |
Subject: |
Re: [Qemu-devel] [PATCH 7/8] xen_disk: simplify blk_disconnect with refcnt |
Date: |
Thu, 25 Jul 2013 21:30:35 -0400 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
On Thu, Jul 25, 2013 at 08:56:41AM -0400, Jeff Cody wrote:
> On Thu, Jul 25, 2013 at 05:01:45PM +0800, Fam Zheng wrote:
> > We call bdrv_attach_dev when initializing whether or not bs is created
> > locally, so call bdrv_detach_dev and let the refcnt handle the
> > lifecycle.
> >
> > Signed-off-by: Fam Zheng <address@hidden>
> > ---
> > hw/block/xen_disk.c | 7 +------
> > 1 file changed, 1 insertion(+), 6 deletions(-)
> >
> > diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c
> > index 99537e8..3ec4bd2 100644
> > --- a/hw/block/xen_disk.c
> > +++ b/hw/block/xen_disk.c
> > @@ -910,12 +910,7 @@ static void blk_disconnect(struct XenDevice *xendev)
> > struct XenBlkDev *blkdev = container_of(xendev, struct XenBlkDev,
> > xendev);
> >
> > if (blkdev->bs) {
> > - if (!blkdev->dinfo) {
> > - /* close/delete only if we created it ourself */
> > - bdrv_close(blkdev->bs);
> > - bdrv_detach_dev(blkdev->bs, blkdev);
> > - bdrv_unref(blkdev->bs);
> > - }
> > + bdrv_detach_dev(blkdev->bs, blkdev);
> > blkdev->bs = NULL;
>
> If the refcnt for blkdev->bs is > 1, then this leaks blkdev->bs, and
> doesn't call bdrv_close().
>
Same with this, I don't think it will leak this either.
> > }
> > xen_be_unbind_evtchn(&blkdev->xendev);
> > --
> > 1.8.3.2
> >
> >
- Re: [Qemu-devel] [PATCH 3/8] block: implement reference count for BlockDriverState, (continued)
[Qemu-devel] [PATCH 2/8] iscsi: use bdrv_new() instead of stack structure, Fam Zheng, 2013/07/25
[Qemu-devel] [PATCH 4/8] block: make bdrv_delete() static, Fam Zheng, 2013/07/25
[Qemu-devel] [PATCH 5/8] block: use BlockDriverState refcnt for device attach/detach, Fam Zheng, 2013/07/25
[Qemu-devel] [PATCH 6/8] migration: omit drive ref as we have bdrv_ref now, Fam Zheng, 2013/07/25
[Qemu-devel] [PATCH 7/8] xen_disk: simplify blk_disconnect with refcnt, Fam Zheng, 2013/07/25
[Qemu-devel] [PATCH 8/8] nbd: use BlockDriverState refcnt, Fam Zheng, 2013/07/25