From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O2KkM-0001a6-OA for qemu-devel@nongnu.org; Thu, 15 Apr 2010 04:48:26 -0400 Received: from [140.186.70.92] (port=33579 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O2KkK-0001ZN-T9 for qemu-devel@nongnu.org; Thu, 15 Apr 2010 04:48:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O2KkJ-0006qt-C0 for qemu-devel@nongnu.org; Thu, 15 Apr 2010 04:48:24 -0400 Received: from mail-qy0-f183.google.com ([209.85.221.183]:50337) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O2KkJ-0006qo-5s for qemu-devel@nongnu.org; Thu, 15 Apr 2010 04:48:23 -0400 Received: by qyk13 with SMTP id 13so1267869qyk.18 for ; Thu, 15 Apr 2010 01:48:22 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <1271260214-27443-5-git-send-email-kwolf@redhat.com> References: <1271260214-27443-1-git-send-email-kwolf@redhat.com> <1271260214-27443-5-git-send-email-kwolf@redhat.com> Date: Thu, 15 Apr 2010 09:48:22 +0100 Message-ID: Subject: Re: [Qemu-devel] [RFC PATCH 4/5] block: Open the underlying image file in generic code From: Stefan Hajnoczi Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: qemu-devel@nongnu.org, hch@lst.de On Wed, Apr 14, 2010 at 4:50 PM, Kevin Wolf wrote: > diff --git a/block/qcow.c b/block/qcow.c > index c619984..01b1692 100644 > --- a/block/qcow.c > +++ b/block/qcow.c [..] > @@ -169,7 +166,7 @@ static int qcow_open(BlockDriverState *bs, const char= *filename, int flags) > =A0 =A0 qemu_free(s->l2_cache); > =A0 =A0 qemu_free(s->cluster_cache); > =A0 =A0 qemu_free(s->cluster_data); > - =A0 =A0bdrv_delete(s->hd); > + =A0 =A0bdrv_delete(bs->file); > =A0 =A0 return -1; > =A0} qcow.c does not need to delete bs->file anymore because block.c does that when BlockDriver->bdrv_open() fails. Also since we're not setting bs->file to NULL after bdrv_delete() here, block.c will double delete it. > @@ -739,7 +737,7 @@ static void qcow_close(BlockDriverState *bs) > =A0 =A0 qemu_free(s->l2_cache); > =A0 =A0 qemu_free(s->cluster_cache); > =A0 =A0 qemu_free(s->cluster_data); > - =A0 =A0bdrv_delete(s->hd); > + =A0 =A0bdrv_delete(bs->file); > =A0} > > =A0static int qcow_create(const char *filename, QEMUOptionParameter *opti= ons) block.c will bdrv_close(bs->file) for us, so I think this is not needed. Double delete. > diff --git a/block/qcow2.c b/block/qcow2.c > index 11ce8d1..4949d77 100644 > --- a/block/qcow2.c > +++ b/block/qcow2.c [...] > @@ -254,7 +250,7 @@ static int qcow_open(BlockDriverState *bs, const char= *filename, int flags) > =A0 =A0 qemu_free(s->l2_cache); > =A0 =A0 qemu_free(s->cluster_cache); > =A0 =A0 qemu_free(s->cluster_data); > - =A0 =A0bdrv_delete(s->hd); > + =A0 =A0bdrv_delete(bs->file); > =A0 =A0 return -1; > =A0} Same as above. > diff --git a/block/vdi.c b/block/vdi.c > index c91961a..8b85339 100644 > --- a/block/vdi.c > +++ b/block/vdi.c [...] > @@ -452,7 +446,7 @@ static int vdi_open(BlockDriverState *bs, const char = *filename, int flags) > =A0 =A0 qemu_free(s->bmap); > > =A0fail: > - =A0 =A0bdrv_delete(s->hd); > + =A0 =A0bdrv_delete(bs->file); > =A0 =A0 return -1; > =A0} Same as above. > diff --git a/block/vpc.c b/block/vpc.c > index 950ad58..1d1ae09 100644 > --- a/block/vpc.c > +++ b/block/vpc.c [...] > @@ -228,7 +224,7 @@ static int vpc_open(BlockDriverState *bs, const char = *filename, int flags) > > =A0 =A0 return 0; > =A0fail: > - =A0 =A0bdrv_delete(s->hd); > + =A0 =A0bdrv_delete(bs->file); > =A0 =A0 return -1; > =A0} Same as above. > @@ -590,7 +584,7 @@ static void vpc_close(BlockDriverState *bs) > =A0#ifdef CACHE > =A0 =A0 qemu_free(s->pageentry_u8); > =A0#endif > - =A0 =A0bdrv_delete(s->hd); > + =A0 =A0bdrv_delete(bs->file); > =A0} > > =A0static QEMUOptionParameter vpc_create_options[] =3D { Same as above. Stefan