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

9pfs: move pdus to V9fsState 



pdus are initialized and used in 9pfs common code. Move the array from
V9fsVirtioState to V9fsState.

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 dbe2b655

hw/9pfs/9p.c

+3 −4
Original line number Diff line number Diff line
@@ -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);

hw/9pfs/9p.h

+1 −0
Original line number Diff line number Diff line
@@ -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.

hw/9pfs/virtio-9p.h

+0 −1
Original line number Diff line number Diff line
@@ -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;