Re: [Qemu-devel] [PATCH 2/2 v15] throttle: factor out duplicate code

[Pradeep Jagadeesh]

On 2/3/2017 11:38 AM, Alberto Garcia wrote:
> On Fri 03 Feb 2017 11:04:58 AM CET, Pradeep Jagadeesh wrote:
>
> > This patch removes the redundant throttle code that was present in
> > block and fsdev device files. Now the common code is moved to a single
> > file.
>
> Here it says that this patch moves common code to a separate file,
> however:

Hmm, sorry. I just messed it up while merging.

Regards,
Pradeep
> > diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
> > index 920eb05..22a6a99 100644
> > --- a/hw/9pfs/9p.c
> > +++ b/hw/9pfs/9p.c
> > @@ -3532,7 +3532,6 @@ out:
> >          if (s->ops && s->ops->cleanup && s->ctx.private) {
> >              s->ops->cleanup(&s->ctx);
> >          }
> > -        fsdev_throttle_cleanup(s->ctx.fst);
> >          g_free(s->tag);
> >          g_free(s->ctx.fs_root);
> >          v9fs_path_free(&path);
> > @@ -3545,6 +3544,7 @@ void v9fs_device_unrealize_common(V9fsState *s, Error 
> > **errp)
> >      if (s->ops->cleanup) {
> >          s->ops->cleanup(&s->ctx);
> >      }
> > +    fsdev_throttle_cleanup(s->ctx.fst);
> >      g_free(s->tag);
> >      g_free(s->ctx.fs_root);
> >  }
>
> This doesn't belong here. In patch 1 you add a fsdev_throttle_cleanup()
> in v9fs_device_realize_common(), and in patch 2 you remove it from there
> and put it in v9fs_device_unrealize_common().
>
> It looks like you wanted to fix patch 1 but added the fix to patch 2
> instead.
>
> Berto