Re: [Qemu-devel] [PATCH v2 3/3] vmdk: Switch to heap arrays for vmdk_parent_open

[Kevin Wolf <kwolf@redhat.com>]

Am 09.03.2016 um 01:43 hat Fam Zheng geschrieben:
> On Tue, 03/08 16:24, Fam Zheng wrote:
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> > ---
> >  block/vmdk.c | 17 +++++++++++------
> >  1 file changed, 11 insertions(+), 6 deletions(-)
> > 
> > diff --git a/block/vmdk.c b/block/vmdk.c
> > index c68f456..03be7f0 100644
> > --- a/block/vmdk.c
> > +++ b/block/vmdk.c
> > @@ -343,15 +343,16 @@ static int vmdk_reopen_prepare(BDRVReopenState *state,
> >  static int vmdk_parent_open(BlockDriverState *bs)
> >  {
> >      char *p_name;
> > -    char desc[DESC_SIZE + 1];
> > +    char *desc;
> >      BDRVVmdkState *s = bs->opaque;
> >      int ret;
> >  
> > -    desc[DESC_SIZE] = '\0';
> > +    desc = g_malloc0(DESC_SIZE + 1);
> >      ret = bdrv_pread(bs->file->bs, s->desc_offset, desc, DESC_SIZE);
> >      if (ret < 0) {
> > -        return ret;
> > +        goto out;
> >      }
> > +    ret = 0;
> 
> Kevin, were you referring to this "ret = 0" in the cover letter? If so, it is
> not useless, because ret was set to DESC_SIZE by bdrv_pread. :)

Nope, I meant the initialisation in patch 1.

Kevin