Re: [Qemu-devel] [PATCH 1/4] 9pfs: move pdus to V9fsState

[Greg Kurz]

On Mon, 21 Nov 2016 13:39:29 -0800
Stefano Stabellini <address@hidden> wrote:

> pdus are initialized and used in 9pfs common code. Move the array from
> V9fsVirtioState to V9fsState.
> 
> Signed-off-by: Stefano Stabellini <address@hidden>
> ---

Reviewed-by: Greg Kurz <address@hidden>

>  hw/9pfs/9p.c        | 7 +++----
>  hw/9pfs/9p.h        | 1 +
>  hw/9pfs/virtio-9p.h | 1 -
>  3 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
> index aea7e9d..05e950f 100644
> --- a/hw/9pfs/9p.c
> +++ b/hw/9pfs/9p.c
> @@ -3440,7 +3440,6 @@ void pdu_submit(V9fsPDU *pdu)
>  /* Returns 0 on success, 1 on failure. */
>  int v9fs_device_realize_common(V9fsState *s, Error **errp)
>  {
> -    V9fsVirtioState *v = container_of(s, V9fsVirtioState, state);
>      int i, len;
>      struct stat stat;
>      FsDriverEntry *fse;
> @@ -3451,9 +3450,9 @@ int v9fs_device_realize_common(V9fsState *s, Error 
> **errp)
>      QLIST_INIT(&s->free_list);
>      QLIST_INIT(&s->active_list);
>      for (i = 0; i < (MAX_REQ - 1); i++) {
> -        QLIST_INSERT_HEAD(&s->free_list, &v->pdus[i], next);
> -        v->pdus[i].s = s;
> -        v->pdus[i].idx = i;
> +        QLIST_INSERT_HEAD(&s->free_list, &s->pdus[i], next);
> +        s->pdus[i].s = s;
> +        s->pdus[i].idx = i;
>      }
>  
>      v9fs_path_init(&path);
> diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h
> index 3976b7f..07cee01 100644
> --- a/hw/9pfs/9p.h
> +++ b/hw/9pfs/9p.h
> @@ -229,6 +229,7 @@ typedef struct V9fsState
>      char *tag;
>      enum p9_proto_version proto_version;
>      int32_t msize;
> +    V9fsPDU pdus[MAX_REQ];
>      /*
>       * lock ensuring atomic path update
>       * on rename.
> diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h
> index 25c47c7..52c4b9d 100644
> --- a/hw/9pfs/virtio-9p.h
> +++ b/hw/9pfs/virtio-9p.h
> @@ -10,7 +10,6 @@ typedef struct V9fsVirtioState
>      VirtIODevice parent_obj;
>      VirtQueue *vq;
>      size_t config_size;
> -    V9fsPDU pdus[MAX_REQ];
>      VirtQueueElement *elems[MAX_REQ];
>      V9fsState state;
>  } V9fsVirtioState;