Re: [PATCH v2 02/16] migration: make vmstate_save_state_v() static

[Fabiano Rosas <farosas@suse.de>]

Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> writes:

> It's used only in vmstate.c.
>
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
> ---
>  include/migration/vmstate.h |  3 ---
>  migration/vmstate.c         | 19 ++++++++++---------
>  2 files changed, 10 insertions(+), 12 deletions(-)
>
> diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
> index 89f9f49d20..3695afd483 100644
> --- a/include/migration/vmstate.h
> +++ b/include/migration/vmstate.h
> @@ -1234,9 +1234,6 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
>                         void *opaque, int version_id, Error **errp);
>  int vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd,
>                         void *opaque, JSONWriter *vmdesc, Error **errp);
> -int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd,
> -                         void *opaque, JSONWriter *vmdesc,
> -                         int version_id, Error **errp);
>  
>  bool vmstate_section_needed(const VMStateDescription *vmsd, void *opaque);
>  
> diff --git a/migration/vmstate.c b/migration/vmstate.c
> index fccd030dfd..651c3fe011 100644
> --- a/migration/vmstate.c
> +++ b/migration/vmstate.c
> @@ -420,15 +420,9 @@ bool vmstate_section_needed(const VMStateDescription *vmsd, void *opaque)
>      return true;
>  }
>  
> -
> -int vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd,
> -                       void *opaque, JSONWriter *vmdesc_id, Error **errp)
> -{
> -    return vmstate_save_state_v(f, vmsd, opaque, vmdesc_id, vmsd->version_id, errp);
> -}
> -
> -int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd,
> -                         void *opaque, JSONWriter *vmdesc, int version_id, Error **errp)
> +static int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd,
> +                                void *opaque, JSONWriter *vmdesc,
> +                                int version_id, Error **errp)
>  {
>      ERRP_GUARD();
>      int ret = 0;
> @@ -608,6 +602,13 @@ vmstate_get_subsection(const VMStateDescription * const *sub,
>      return NULL;
>  }
>  
> +int vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd,
> +                       void *opaque, JSONWriter *vmdesc_id, Error **errp)
> +{
> +    return vmstate_save_state_v(f, vmsd, opaque, vmdesc_id, vmsd->version_id,
> +                                errp);
> +}
> +
>  static int vmstate_subsection_load(QEMUFile *f, const VMStateDescription *vmsd,
>                                     void *opaque, Error **errp)
>  {

Reviewed-by: Fabiano Rosas <farosas@suse.de>