提交 583f21f8 编写于 作者: S Stefano Stabellini 提交者: Greg Kurz

9pfs: move pdus to V9fsState

pdus are initialized and used in 9pfs common code. Move the array from
V9fsVirtioState to V9fsState.
Signed-off-by: NStefano Stabellini <sstabellini@kernel.org>
Reviewed-by: NGreg Kurz <groug@kaod.org>
Signed-off-by: NGreg Kurz <groug@kaod.org>
上级 dbe2b655
...@@ -3440,7 +3440,6 @@ void pdu_submit(V9fsPDU *pdu) ...@@ -3440,7 +3440,6 @@ void pdu_submit(V9fsPDU *pdu)
/* Returns 0 on success, 1 on failure. */ /* Returns 0 on success, 1 on failure. */
int v9fs_device_realize_common(V9fsState *s, Error **errp) int v9fs_device_realize_common(V9fsState *s, Error **errp)
{ {
V9fsVirtioState *v = container_of(s, V9fsVirtioState, state);
int i, len; int i, len;
struct stat stat; struct stat stat;
FsDriverEntry *fse; FsDriverEntry *fse;
...@@ -3451,9 +3450,9 @@ int v9fs_device_realize_common(V9fsState *s, Error **errp) ...@@ -3451,9 +3450,9 @@ int v9fs_device_realize_common(V9fsState *s, Error **errp)
QLIST_INIT(&s->free_list); QLIST_INIT(&s->free_list);
QLIST_INIT(&s->active_list); QLIST_INIT(&s->active_list);
for (i = 0; i < (MAX_REQ - 1); i++) { for (i = 0; i < (MAX_REQ - 1); i++) {
QLIST_INSERT_HEAD(&s->free_list, &v->pdus[i], next); QLIST_INSERT_HEAD(&s->free_list, &s->pdus[i], next);
v->pdus[i].s = s; s->pdus[i].s = s;
v->pdus[i].idx = i; s->pdus[i].idx = i;
} }
v9fs_path_init(&path); v9fs_path_init(&path);
......
...@@ -229,6 +229,7 @@ typedef struct V9fsState ...@@ -229,6 +229,7 @@ typedef struct V9fsState
char *tag; char *tag;
enum p9_proto_version proto_version; enum p9_proto_version proto_version;
int32_t msize; int32_t msize;
V9fsPDU pdus[MAX_REQ];
/* /*
* lock ensuring atomic path update * lock ensuring atomic path update
* on rename. * on rename.
......
...@@ -10,7 +10,6 @@ typedef struct V9fsVirtioState ...@@ -10,7 +10,6 @@ typedef struct V9fsVirtioState
VirtIODevice parent_obj; VirtIODevice parent_obj;
VirtQueue *vq; VirtQueue *vq;
size_t config_size; size_t config_size;
V9fsPDU pdus[MAX_REQ];
VirtQueueElement *elems[MAX_REQ]; VirtQueueElement *elems[MAX_REQ];
V9fsState state; V9fsState state;
} V9fsVirtioState; } V9fsVirtioState;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册