Commit ea83441c authored by Stefano Stabellini's avatar Stefano Stabellini Committed by Greg Kurz
Browse files

9pfs: introduce transport specific callbacks 



Don't call virtio functions from 9pfs generic code, use generic function
callbacks instead.

Signed-off-by: default avatarStefano Stabellini <sstabellini@kernel.org>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
Signed-off-by: default avatarGreg Kurz <groug@kaod.org>
parent 583f21f8

hw/9pfs/9p.c

+4 −4
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ ssize_t pdu_marshal(V9fsPDU *pdu, size_t offset, const char *fmt, ...) 
    va_list ap;



    va_start(ap, fmt);

    ret = virtio_pdu_vmarshal(pdu, offset, fmt, ap);

    ret = pdu->s->transport->pdu_vmarshal(pdu, offset, fmt, ap);

    va_end(ap);



    return ret;
@@ -59,7 +59,7 @@ ssize_t pdu_unmarshal(V9fsPDU *pdu, size_t offset, const char *fmt, ...) 
    va_list ap;



    va_start(ap, fmt);

    ret = virtio_pdu_vunmarshal(pdu, offset, fmt, ap);

    ret = pdu->s->transport->pdu_vunmarshal(pdu, offset, fmt, ap);

    va_end(ap);



    return ret;
@@ -67,7 +67,7 @@ ssize_t pdu_unmarshal(V9fsPDU *pdu, size_t offset, const char *fmt, ...) 


static void pdu_push_and_notify(V9fsPDU *pdu)

{

    virtio_9p_push_and_notify(pdu);

    pdu->s->transport->push_and_notify(pdu);

}



static int omode_to_uflags(int8_t mode)
@@ -1751,7 +1751,7 @@ static void v9fs_init_qiov_from_pdu(QEMUIOVector *qiov, V9fsPDU *pdu, 
    struct iovec *iov;

    unsigned int niov;



    virtio_init_iov_from_pdu(pdu, &iov, &niov, is_write);

    pdu->s->transport->init_iov_from_pdu(pdu, &iov, &niov, is_write);



    qemu_iovec_init_external(&elem, iov, niov);

    qemu_iovec_init(qiov, niov);

hw/9pfs/9p.h

+19 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ typedef struct V9fsState 
    enum p9_proto_version proto_version;

    int32_t msize;

    V9fsPDU pdus[MAX_REQ];

    const struct V9fsTransport *transport;

    /*

     * lock ensuring atomic path update

     * on rename.
@@ -343,4 +344,22 @@ void pdu_free(V9fsPDU *pdu); 
void pdu_submit(V9fsPDU *pdu);

void v9fs_reset(V9fsState *s);



struct V9fsTransport {

    ssize_t     (*pdu_vmarshal)(V9fsPDU *pdu, size_t offset, const char *fmt,

                                va_list ap);

    ssize_t     (*pdu_vunmarshal)(V9fsPDU *pdu, size_t offset, const char *fmt,

                                  va_list ap);

    void        (*init_iov_from_pdu)(V9fsPDU *pdu, struct iovec **piov,

                                     unsigned int *pniov, bool is_write);

    void        (*push_and_notify)(V9fsPDU *pdu);

};



static inline int v9fs_register_transport(V9fsState *s,

        const struct V9fsTransport *t)

{

    assert(!s->transport);

    s->transport = t;

    return 0;

}



#endif

hw/9pfs/virtio-9p-device.c

+17 −7
Original line number Diff line number Diff line
@@ -20,7 +20,9 @@ 
#include "hw/virtio/virtio-access.h"

#include "qemu/iov.h"



void virtio_9p_push_and_notify(V9fsPDU *pdu)

static const struct V9fsTransport virtio_9p_transport;



static void virtio_9p_push_and_notify(V9fsPDU *pdu)

{

    V9fsState *s = pdu->s;

    V9fsVirtioState *v = container_of(s, V9fsVirtioState, state);
@@ -126,6 +128,7 @@ static void virtio_9p_device_realize(DeviceState *dev, Error **errp) 
    v->config_size = sizeof(struct virtio_9p_config) + strlen(s->fsconf.tag);

    virtio_init(vdev, "virtio-9p", VIRTIO_ID_9P, v->config_size);

    v->vq = virtio_add_queue(vdev, MAX_REQ, handle_9p_output);

    v9fs_register_transport(s, &virtio_9p_transport);



out:

    return;
@@ -148,7 +151,7 @@ static void virtio_9p_reset(VirtIODevice *vdev) 
    v9fs_reset(&v->state);

}



ssize_t virtio_pdu_vmarshal(V9fsPDU *pdu, size_t offset,

static ssize_t virtio_pdu_vmarshal(V9fsPDU *pdu, size_t offset,

                                   const char *fmt, va_list ap)

{

    V9fsState *s = pdu->s;
@@ -158,7 +161,7 @@ ssize_t virtio_pdu_vmarshal(V9fsPDU *pdu, size_t offset, 
    return v9fs_iov_vmarshal(elem->in_sg, elem->in_num, offset, 1, fmt, ap);

}



ssize_t virtio_pdu_vunmarshal(V9fsPDU *pdu, size_t offset,

static ssize_t virtio_pdu_vunmarshal(V9fsPDU *pdu, size_t offset,

                                     const char *fmt, va_list ap)

{

    V9fsState *s = pdu->s;
@@ -168,7 +171,7 @@ ssize_t virtio_pdu_vunmarshal(V9fsPDU *pdu, size_t offset, 
    return v9fs_iov_vunmarshal(elem->out_sg, elem->out_num, offset, 1, fmt, ap);

}



void virtio_init_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov,

static void virtio_init_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov,

                                     unsigned int *pniov, bool is_write)

{

    V9fsState *s = pdu->s;
@@ -184,6 +187,13 @@ void virtio_init_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov, 
    }

}



static const struct V9fsTransport virtio_9p_transport = {

    .pdu_vmarshal = virtio_pdu_vmarshal,

    .pdu_vunmarshal = virtio_pdu_vunmarshal,

    .init_iov_from_pdu = virtio_init_iov_from_pdu,

    .push_and_notify = virtio_9p_push_and_notify,

};



/* virtio-9p device */



static const VMStateDescription vmstate_virtio_9p = {

hw/9pfs/virtio-9p.h

+0 −9
Original line number Diff line number Diff line
@@ -14,15 +14,6 @@ typedef struct V9fsVirtioState 
    V9fsState state;

} V9fsVirtioState;



void virtio_9p_push_and_notify(V9fsPDU *pdu);



ssize_t virtio_pdu_vmarshal(V9fsPDU *pdu, size_t offset,

                            const char *fmt, va_list ap);

ssize_t virtio_pdu_vunmarshal(V9fsPDU *pdu, size_t offset,

                              const char *fmt, va_list ap);

void virtio_init_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov,

                              unsigned int *pniov, bool is_write);



#define TYPE_VIRTIO_9P "virtio-9p-device"

#define VIRTIO_9P(obj) \

        OBJECT_CHECK(V9fsVirtioState, (obj), TYPE_VIRTIO_9P)