Re: [Qemu-devel] [PATCH] virtio-9p/xen-9p: move 9p specific bits to core 9p code

[Stefano Stabellini]

On Thu, 27 Apr 2017, Greg Kurz wrote:
> These bits aren't related to the transport so let's move them to the core
> code.
> 
> Signed-off-by: Greg Kurz <address@hidden>

Reviewed-by: Stefano Stabellini <address@hidden>


> ---
>  hw/9pfs/9p.c               |    8 +++++++-
>  hw/9pfs/9p.h               |    2 +-
>  hw/9pfs/virtio-9p-device.c |    8 +-------
>  hw/9pfs/xen-9p-backend.c   |    6 +-----
>  4 files changed, 10 insertions(+), 14 deletions(-)
> 
> diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
> index c80ba67389ce..b40001e3dea3 100644
> --- a/hw/9pfs/9p.c
> +++ b/hw/9pfs/9p.c
> @@ -3446,12 +3446,16 @@ static inline bool is_read_only_op(V9fsPDU *pdu)
>      }
>  }
>  
> -void pdu_submit(V9fsPDU *pdu)
> +void pdu_submit(V9fsPDU *pdu, P9MsgHeader *hdr)
>  {
>      Coroutine *co;
>      CoroutineEntry *handler;
>      V9fsState *s = pdu->s;
>  
> +    pdu->size = le32_to_cpu(hdr->size_le);
> +    pdu->id = hdr->id;
> +    pdu->tag = le16_to_cpu(hdr->tag_le);
> +
>      if (pdu->id >= ARRAY_SIZE(pdu_co_handlers) ||
>          (pdu_co_handlers[pdu->id] == NULL)) {
>          handler = v9fs_op_not_supp;
> @@ -3462,6 +3466,8 @@ void pdu_submit(V9fsPDU *pdu)
>      if (is_ro_export(&s->ctx) && !is_read_only_op(pdu)) {
>          handler = v9fs_fs_ro;
>      }
> +
> +    qemu_co_queue_init(&pdu->complete);
>      co = qemu_coroutine_create(handler, pdu);
>      qemu_coroutine_enter(co);
>  }
> diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h
> index 5312d8a42405..c886ba78d2ee 100644
> --- a/hw/9pfs/9p.h
> +++ b/hw/9pfs/9p.h
> @@ -347,7 +347,7 @@ ssize_t pdu_marshal(V9fsPDU *pdu, size_t offset, const 
> char *fmt, ...);
>  ssize_t pdu_unmarshal(V9fsPDU *pdu, size_t offset, const char *fmt, ...);
>  V9fsPDU *pdu_alloc(V9fsState *s);
>  void pdu_free(V9fsPDU *pdu);
> -void pdu_submit(V9fsPDU *pdu);
> +void pdu_submit(V9fsPDU *pdu, P9MsgHeader *hdr);
>  void v9fs_reset(V9fsState *s);
>  
>  struct V9fsTransport {
> diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
> index 3782f437029b..245abd8aaef1 100644
> --- a/hw/9pfs/virtio-9p-device.c
> +++ b/hw/9pfs/virtio-9p-device.c
> @@ -70,13 +70,7 @@ static void handle_9p_output(VirtIODevice *vdev, VirtQueue 
> *vq)
>              goto out_free_req;
>          }
>  
> -        pdu->size = le32_to_cpu(out.size_le);
> -
> -        pdu->id = out.id;
> -        pdu->tag = le16_to_cpu(out.tag_le);
> -
> -        qemu_co_queue_init(&pdu->complete);
> -        pdu_submit(pdu);
> +        pdu_submit(pdu, &out);
>      }
>  
>      return;
> diff --git a/hw/9pfs/xen-9p-backend.c b/hw/9pfs/xen-9p-backend.c
> index 9c7f41af99da..c0b9d534298a 100644
> --- a/hw/9pfs/xen-9p-backend.c
> +++ b/hw/9pfs/xen-9p-backend.c
> @@ -243,14 +243,10 @@ static int xen_9pfs_receive(Xen9pfsRing *ring)
>  
>      /* cannot fail, because we only handle one request per ring at a time */
>      pdu = pdu_alloc(&ring->priv->state);
> -    pdu->size = le32_to_cpu(h.size_le);
> -    pdu->id = h.id;
> -    pdu->tag = le32_to_cpu(h.tag_le);
>      ring->out_size = le32_to_cpu(h.size_le);
>      ring->out_cons = cons + le32_to_cpu(h.size_le);
>  
> -    qemu_co_queue_init(&pdu->complete);
> -    pdu_submit(pdu);
> +    pdu_submit(pdu, &h);
>  
>      return 0;
>  }
>