ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

9pfs: PDU processing functions don't need to take V9fsState as argument 

V9fsState can be referenced by pdu->s. Initialise that in device
realization function.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
This commit is contained in:
Wei Liu 2015-12-02 12:06:28 +00:00 committed by Aneesh Kumar K.V
parent 2209bd050a
commit ad38ce9ed1
2 changed files with 46 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/9pfs/virtio-9p-device.c
View File

@ -69,6 +69,7 @@ static void virtio_9p_device_realize(DeviceState *dev, Error **errp)
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, &s->pdus[i], next); QLIST_INSERT_HEAD(&s->free_list, &s->pdus[i], next);
s->pdus[i].s = s;
} }
s->vq = virtio_add_queue(vdev, MAX_REQ, handle_9p_output); s->vq = virtio_add_queue(vdev, MAX_REQ, handle_9p_output);

98
hw/9pfs/virtio-9p.c
View File

@ -575,9 +575,10 @@ static V9fsPDU *alloc_pdu(V9fsState *s)
return pdu; return pdu;
} }
static void free_pdu(V9fsState *s, V9fsPDU *pdu) static void free_pdu(V9fsPDU *pdu)
{ {
if (pdu) { if (pdu) {
V9fsState *s = pdu->s;
/* /*
* Cancelled pdu are added back to the freelist * Cancelled pdu are added back to the freelist
* by flush request . * by flush request .
@ -594,9 +595,10 @@ static void free_pdu(V9fsState *s, V9fsPDU *pdu)
* because we always expect to have enough space to encode * because we always expect to have enough space to encode
* error details * error details
*/ */
static void complete_pdu(V9fsState *s, V9fsPDU *pdu, ssize_t len) static void complete_pdu(V9fsPDU *pdu, ssize_t len)
{ {
int8_t id = pdu->id + 1; /* Response */ int8_t id = pdu->id + 1; /* Response */
V9fsState *s = pdu->s;
if (len < 0) { if (len < 0) {
int err = -len; int err = -len;
@ -636,7 +638,7 @@ static void complete_pdu(V9fsState *s, V9fsPDU *pdu, ssize_t len)
/* Now wakeup anybody waiting in flush for this request */ /* Now wakeup anybody waiting in flush for this request */
qemu_co_queue_next(&pdu->complete); qemu_co_queue_next(&pdu->complete);
free_pdu(s, pdu); free_pdu(pdu);
} }
static mode_t v9mode_to_mode(uint32_t mode, V9fsString *extension) static mode_t v9mode_to_mode(uint32_t mode, V9fsString *extension)
@ -931,7 +933,7 @@ static void v9fs_version(void *opaque)
offset += err; offset += err;
trace_v9fs_version_return(pdu->tag, pdu->id, s->msize, version.data); trace_v9fs_version_return(pdu->tag, pdu->id, s->msize, version.data);
out: out:
complete_pdu(s, pdu, offset); complete_pdu(pdu, offset);
v9fs_string_free(&version); v9fs_string_free(&version);
} }
@ -995,7 +997,7 @@ static void v9fs_attach(void *opaque)
out: out:
put_fid(pdu, fidp); put_fid(pdu, fidp);
out_nofid: out_nofid:
complete_pdu(s, pdu, err); complete_pdu(pdu, err);
v9fs_string_free(&uname); v9fs_string_free(&uname);
v9fs_string_free(&aname); v9fs_string_free(&aname);
} }
@ -1009,7 +1011,6 @@ static void v9fs_stat(void *opaque)
struct stat stbuf; struct stat stbuf;
V9fsFidState *fidp; V9fsFidState *fidp;
V9fsPDU *pdu = opaque; V9fsPDU *pdu = opaque;
V9fsState *s = pdu->s;
err = pdu_unmarshal(pdu, offset, "d", &fid); err = pdu_unmarshal(pdu, offset, "d", &fid);
if (err < 0) { if (err < 0) {
@ -1042,7 +1043,7 @@ static void v9fs_stat(void *opaque)
out: out:
put_fid(pdu, fidp); put_fid(pdu, fidp);
out_nofid: out_nofid:
complete_pdu(s, pdu, err); complete_pdu(pdu, err);
} }
static void v9fs_getattr(void *opaque) static void v9fs_getattr(void *opaque)
@ -1105,7 +1106,7 @@ static void v9fs_getattr(void *opaque)
out: out:
put_fid(pdu, fidp); put_fid(pdu, fidp);
out_nofid: out_nofid:
complete_pdu(s, pdu, retval); complete_pdu(pdu, retval);
} }
/* Attribute flags */ /* Attribute flags */
@ -1129,7 +1130,6 @@ static void v9fs_setattr(void *opaque)
size_t offset = 7; size_t offset = 7;
V9fsIattr v9iattr; V9fsIattr v9iattr;
V9fsPDU *pdu = opaque; V9fsPDU *pdu = opaque;
V9fsState *s = pdu->s;
err = pdu_unmarshal(pdu, offset, "dI", &fid, &v9iattr); err = pdu_unmarshal(pdu, offset, "dI", &fid, &v9iattr);
if (err < 0) { if (err < 0) {
@ -1203,7 +1203,7 @@ static void v9fs_setattr(void *opaque)
out: out:
put_fid(pdu, fidp); put_fid(pdu, fidp);
out_nofid: out_nofid:
complete_pdu(s, pdu, err); complete_pdu(pdu, err);
} }
static int v9fs_walk_marshal(V9fsPDU *pdu, uint16_t nwnames, V9fsQID *qids) static int v9fs_walk_marshal(V9fsPDU *pdu, uint16_t nwnames, V9fsQID *qids)
@ -1245,7 +1245,7 @@ static void v9fs_walk(void *opaque)
err = pdu_unmarshal(pdu, offset, "ddw", &fid, &newfid, &nwnames); err = pdu_unmarshal(pdu, offset, "ddw", &fid, &newfid, &nwnames);
if (err < 0) { if (err < 0) {
complete_pdu(s, pdu, err); complete_pdu(pdu, err);
return ; return ;
} }
offset += err; offset += err;
@ -1313,7 +1313,7 @@ out:
v9fs_path_free(&dpath); v9fs_path_free(&dpath);
v9fs_path_free(&path); v9fs_path_free(&path);
out_nofid: out_nofid:
complete_pdu(s, pdu, err); complete_pdu(pdu, err);
if (nwnames && nwnames <= P9_MAXWELEM) { if (nwnames && nwnames <= P9_MAXWELEM) {
for (name_idx = 0; name_idx < nwnames; name_idx++) { for (name_idx = 0; name_idx < nwnames; name_idx++) {
v9fs_string_free(&wnames[name_idx]); v9fs_string_free(&wnames[name_idx]);
@ -1430,7 +1430,7 @@ static void v9fs_open(void *opaque)
out: out:
put_fid(pdu, fidp); put_fid(pdu, fidp);
out_nofid: out_nofid:
complete_pdu(s, pdu, err); complete_pdu(pdu, err);
} }
static void v9fs_lcreate(void *opaque) static void v9fs_lcreate(void *opaque)
@ -1487,7 +1487,7 @@ static void v9fs_lcreate(void *opaque)
out: out:
put_fid(pdu, fidp); put_fid(pdu, fidp);
out_nofid: out_nofid:
complete_pdu(pdu->s, pdu, err); complete_pdu(pdu, err);
v9fs_string_free(&name); v9fs_string_free(&name);
} }
@ -1499,7 +1499,6 @@ static void v9fs_fsync(void *opaque)
size_t offset = 7; size_t offset = 7;
V9fsFidState *fidp; V9fsFidState *fidp;
V9fsPDU *pdu = opaque; V9fsPDU *pdu = opaque;
V9fsState *s = pdu->s;
err = pdu_unmarshal(pdu, offset, "dd", &fid, &datasync); err = pdu_unmarshal(pdu, offset, "dd", &fid, &datasync);
if (err < 0) { if (err < 0) {
@ -1518,7 +1517,7 @@ static void v9fs_fsync(void *opaque)
} }
put_fid(pdu, fidp); put_fid(pdu, fidp);
out_nofid: out_nofid:
complete_pdu(s, pdu, err); complete_pdu(pdu, err);
} }
static void v9fs_clunk(void *opaque) static void v9fs_clunk(void *opaque)
@ -1551,7 +1550,7 @@ static void v9fs_clunk(void *opaque)
err = offset; err = offset;
} }
out_nofid: out_nofid:
complete_pdu(s, pdu, err); complete_pdu(pdu, err);
} }
static int v9fs_xattr_read(V9fsState *s, V9fsPDU *pdu, V9fsFidState *fidp, static int v9fs_xattr_read(V9fsState *s, V9fsPDU *pdu, V9fsFidState *fidp,
@ -1761,7 +1760,7 @@ static void v9fs_read(void *opaque)
out: out:
put_fid(pdu, fidp); put_fid(pdu, fidp);
out_nofid: out_nofid:
complete_pdu(s, pdu, err); complete_pdu(pdu, err);
} }
static size_t v9fs_readdir_data_size(V9fsString *name) static size_t v9fs_readdir_data_size(V9fsString *name)
@ -1848,7 +1847,6 @@ static void v9fs_readdir(void *opaque)
int32_t count; int32_t count;
uint32_t max_count; uint32_t max_count;
V9fsPDU *pdu = opaque; V9fsPDU *pdu = opaque;
V9fsState *s = pdu->s;
retval = pdu_unmarshal(pdu, offset, "dqd", &fid, retval = pdu_unmarshal(pdu, offset, "dqd", &fid,
&initial_offset, &max_count); &initial_offset, &max_count);
@ -1885,7 +1883,7 @@ static void v9fs_readdir(void *opaque)
out: out:
put_fid(pdu, fidp); put_fid(pdu, fidp);
out_nofid: out_nofid:
complete_pdu(s, pdu, retval); complete_pdu(pdu, retval);
} }
static int v9fs_xattr_write(V9fsState *s, V9fsPDU *pdu, V9fsFidState *fidp, static int v9fs_xattr_write(V9fsState *s, V9fsPDU *pdu, V9fsFidState *fidp,
@ -1952,7 +1950,7 @@ static void v9fs_write(void *opaque)
err = pdu_unmarshal(pdu, offset, "dqd", &fid, &off, &count); err = pdu_unmarshal(pdu, offset, "dqd", &fid, &off, &count);
if (err < 0) { if (err < 0) {
complete_pdu(s, pdu, err); complete_pdu(pdu, err);
return; return;
} }
offset += err; offset += err;
@ -2015,7 +2013,7 @@ out:
put_fid(pdu, fidp); put_fid(pdu, fidp);
out_nofid: out_nofid:
qemu_iovec_destroy(&qiov_full); qemu_iovec_destroy(&qiov_full);
complete_pdu(s, pdu, err); complete_pdu(pdu, err);
} }
static void v9fs_create(void *opaque) static void v9fs_create(void *opaque)
@ -2182,7 +2180,7 @@ static void v9fs_create(void *opaque)
out: out:
put_fid(pdu, fidp); put_fid(pdu, fidp);
out_nofid: out_nofid:
complete_pdu(pdu->s, pdu, err); complete_pdu(pdu, err);
v9fs_string_free(&name); v9fs_string_free(&name);
v9fs_string_free(&extension); v9fs_string_free(&extension);
v9fs_path_free(&path); v9fs_path_free(&path);
@ -2229,7 +2227,7 @@ static void v9fs_symlink(void *opaque)
out: out:
put_fid(pdu, dfidp); put_fid(pdu, dfidp);
out_nofid: out_nofid:
complete_pdu(pdu->s, pdu, err); complete_pdu(pdu, err);
v9fs_string_free(&name); v9fs_string_free(&name);
v9fs_string_free(&symname); v9fs_string_free(&symname);
} }
@ -2245,7 +2243,7 @@ static void v9fs_flush(void *opaque)
err = pdu_unmarshal(pdu, offset, "w", &tag); err = pdu_unmarshal(pdu, offset, "w", &tag);
if (err < 0) { if (err < 0) {
complete_pdu(s, pdu, err); complete_pdu(pdu, err);
return; return;
} }
trace_v9fs_flush(pdu->tag, pdu->id, tag); trace_v9fs_flush(pdu->tag, pdu->id, tag);
@ -2262,15 +2260,14 @@ static void v9fs_flush(void *opaque)
*/ */
qemu_co_queue_wait(&cancel_pdu->complete); qemu_co_queue_wait(&cancel_pdu->complete);
cancel_pdu->cancelled = 0; cancel_pdu->cancelled = 0;
free_pdu(pdu->s, cancel_pdu); free_pdu(cancel_pdu);
} }
complete_pdu(s, pdu, 7); complete_pdu(pdu, 7);
} }
static void v9fs_link(void *opaque) static void v9fs_link(void *opaque)
{ {
V9fsPDU *pdu = opaque; V9fsPDU *pdu = opaque;
V9fsState *s = pdu->s;
int32_t dfid, oldfid; int32_t dfid, oldfid;
V9fsFidState *dfidp, *oldfidp; V9fsFidState *dfidp, *oldfidp;
V9fsString name; V9fsString name;
@ -2303,7 +2300,7 @@ out:
put_fid(pdu, dfidp); put_fid(pdu, dfidp);
out_nofid: out_nofid:
v9fs_string_free(&name); v9fs_string_free(&name);
complete_pdu(s, pdu, err); complete_pdu(pdu, err);
} }
/* Only works with path name based fid */ /* Only works with path name based fid */
@ -2348,7 +2345,7 @@ out_err:
clunk_fid(pdu->s, fidp->fid); clunk_fid(pdu->s, fidp->fid);
put_fid(pdu, fidp); put_fid(pdu, fidp);
out_nofid: out_nofid:
complete_pdu(pdu->s, pdu, err); complete_pdu(pdu, err);
} }
static void v9fs_unlinkat(void *opaque) static void v9fs_unlinkat(void *opaque)
@ -2392,7 +2389,7 @@ out_err:
put_fid(pdu, dfidp); put_fid(pdu, dfidp);
v9fs_path_free(&path); v9fs_path_free(&path);
out_nofid: out_nofid:
complete_pdu(pdu->s, pdu, err); complete_pdu(pdu, err);
v9fs_string_free(&name); v9fs_string_free(&name);
} }
@ -2492,7 +2489,7 @@ static void v9fs_rename(void *opaque)
out: out:
put_fid(pdu, fidp); put_fid(pdu, fidp);
out_nofid: out_nofid:
complete_pdu(s, pdu, err); complete_pdu(pdu, err);
v9fs_string_free(&name); v9fs_string_free(&name);
} }
@ -2593,7 +2590,7 @@ static void v9fs_renameat(void *opaque)
} }
out_err: out_err:
complete_pdu(s, pdu, err); complete_pdu(pdu, err);
v9fs_string_free(&old_name); v9fs_string_free(&old_name);
v9fs_string_free(&new_name); v9fs_string_free(&new_name);
} }
@ -2608,7 +2605,6 @@ static void v9fs_wstat(void *opaque)
struct stat stbuf; struct stat stbuf;
V9fsFidState *fidp; V9fsFidState *fidp;
V9fsPDU *pdu = opaque; V9fsPDU *pdu = opaque;
V9fsState *s = pdu->s;
v9fs_stat_init(&v9stat); v9fs_stat_init(&v9stat);
err = pdu_unmarshal(pdu, offset, "dwS", &fid, &unused, &v9stat); err = pdu_unmarshal(pdu, offset, "dwS", &fid, &unused, &v9stat);
@ -2690,7 +2686,7 @@ out:
put_fid(pdu, fidp); put_fid(pdu, fidp);
out_nofid: out_nofid:
v9fs_stat_free(&v9stat); v9fs_stat_free(&v9stat);
complete_pdu(s, pdu, err); complete_pdu(pdu, err);
} }
static int v9fs_fill_statfs(V9fsState *s, V9fsPDU *pdu, struct statfs *stbuf) static int v9fs_fill_statfs(V9fsState *s, V9fsPDU *pdu, struct statfs *stbuf)
@ -2769,7 +2765,7 @@ static void v9fs_statfs(void *opaque)
out: out:
put_fid(pdu, fidp); put_fid(pdu, fidp);
out_nofid: out_nofid:
complete_pdu(s, pdu, retval); complete_pdu(pdu, retval);
} }
static void v9fs_mknod(void *opaque) static void v9fs_mknod(void *opaque)
@ -2786,7 +2782,6 @@ static void v9fs_mknod(void *opaque)
struct stat stbuf; struct stat stbuf;
V9fsFidState *fidp; V9fsFidState *fidp;
V9fsPDU *pdu = opaque; V9fsPDU *pdu = opaque;
V9fsState *s = pdu->s;
v9fs_string_init(&name); v9fs_string_init(&name);
err = pdu_unmarshal(pdu, offset, "dsdddd", &fid, &name, &mode, err = pdu_unmarshal(pdu, offset, "dsdddd", &fid, &name, &mode,
@ -2817,7 +2812,7 @@ static void v9fs_mknod(void *opaque)
out: out:
put_fid(pdu, fidp); put_fid(pdu, fidp);
out_nofid: out_nofid:
complete_pdu(s, pdu, err); complete_pdu(pdu, err);
v9fs_string_free(&name); v9fs_string_free(&name);
} }
@ -2838,7 +2833,6 @@ static void v9fs_lock(void *opaque)
V9fsFidState *fidp; V9fsFidState *fidp;
int32_t fid, err = 0; int32_t fid, err = 0;
V9fsPDU *pdu = opaque; V9fsPDU *pdu = opaque;
V9fsState *s = pdu->s;
status = P9_LOCK_ERROR; status = P9_LOCK_ERROR;
v9fs_string_init(&flock.client_id); v9fs_string_init(&flock.client_id);
@ -2875,7 +2869,7 @@ out_nofid:
err += offset; err += offset;
} }
trace_v9fs_lock_return(pdu->tag, pdu->id, status); trace_v9fs_lock_return(pdu->tag, pdu->id, status);
complete_pdu(s, pdu, err); complete_pdu(pdu, err);
v9fs_string_free(&flock.client_id); v9fs_string_free(&flock.client_id);
} }
@ -2891,7 +2885,6 @@ static void v9fs_getlock(void *opaque)
V9fsGetlock glock; V9fsGetlock glock;
int32_t fid, err = 0; int32_t fid, err = 0;
V9fsPDU *pdu = opaque; V9fsPDU *pdu = opaque;
V9fsState *s = pdu->s;
v9fs_string_init(&glock.client_id); v9fs_string_init(&glock.client_id);
err = pdu_unmarshal(pdu, offset, "dbqqds", &fid, &glock.type, err = pdu_unmarshal(pdu, offset, "dbqqds", &fid, &glock.type,
@ -2925,7 +2918,7 @@ static void v9fs_getlock(void *opaque)
out: out:
put_fid(pdu, fidp); put_fid(pdu, fidp);
out_nofid: out_nofid:
complete_pdu(s, pdu, err); complete_pdu(pdu, err);
v9fs_string_free(&glock.client_id); v9fs_string_free(&glock.client_id);
} }
@ -2969,7 +2962,7 @@ static void v9fs_mkdir(void *opaque)
out: out:
put_fid(pdu, fidp); put_fid(pdu, fidp);
out_nofid: out_nofid:
complete_pdu(pdu->s, pdu, err); complete_pdu(pdu, err);
v9fs_string_free(&name); v9fs_string_free(&name);
} }
@ -3075,7 +3068,7 @@ out:
put_fid(pdu, xattr_fidp); put_fid(pdu, xattr_fidp);
} }
out_nofid: out_nofid:
complete_pdu(s, pdu, err); complete_pdu(pdu, err);
v9fs_string_free(&name); v9fs_string_free(&name);
} }
@ -3090,7 +3083,6 @@ static void v9fs_xattrcreate(void *opaque)
V9fsFidState *file_fidp; V9fsFidState *file_fidp;
V9fsFidState *xattr_fidp; V9fsFidState *xattr_fidp;
V9fsPDU *pdu = opaque; V9fsPDU *pdu = opaque;
V9fsState *s = pdu->s;
v9fs_string_init(&name); v9fs_string_init(&name);
err = pdu_unmarshal(pdu, offset, "dsqd", &fid, &name, &size, &flags); err = pdu_unmarshal(pdu, offset, "dsqd", &fid, &name, &size, &flags);
@ -3116,7 +3108,7 @@ static void v9fs_xattrcreate(void *opaque)
err = offset; err = offset;
put_fid(pdu, file_fidp); put_fid(pdu, file_fidp);
out_nofid: out_nofid:
complete_pdu(s, pdu, err); complete_pdu(pdu, err);
v9fs_string_free(&name); v9fs_string_free(&name);
} }
@ -3156,7 +3148,7 @@ static void v9fs_readlink(void *opaque)
out: out:
put_fid(pdu, fidp); put_fid(pdu, fidp);
out_nofid: out_nofid:
complete_pdu(pdu->s, pdu, err); complete_pdu(pdu, err);
} }
static CoroutineEntry *pdu_co_handlers[] = { static CoroutineEntry *pdu_co_handlers[] = {
@ -3199,13 +3191,13 @@ static CoroutineEntry *pdu_co_handlers[] = {
static void v9fs_op_not_supp(void *opaque) static void v9fs_op_not_supp(void *opaque)
{ {
V9fsPDU *pdu = opaque; V9fsPDU *pdu = opaque;
complete_pdu(pdu->s, pdu, -EOPNOTSUPP); complete_pdu(pdu, -EOPNOTSUPP);
} }
static void v9fs_fs_ro(void *opaque) static void v9fs_fs_ro(void *opaque)
{ {
V9fsPDU *pdu = opaque; V9fsPDU *pdu = opaque;
complete_pdu(pdu->s, pdu, -EROFS); complete_pdu(pdu, -EROFS);
} }
static inline bool is_read_only_op(V9fsPDU *pdu) static inline bool is_read_only_op(V9fsPDU *pdu)
@ -3235,10 +3227,11 @@ static inline bool is_read_only_op(V9fsPDU *pdu)
} }
} }
static void submit_pdu(V9fsState *s, V9fsPDU *pdu) static void submit_pdu(V9fsPDU *pdu)
{ {
Coroutine *co; Coroutine *co;
CoroutineEntry *handler; CoroutineEntry *handler;
V9fsState *s = pdu->s;
if (pdu->id >= ARRAY_SIZE(pdu_co_handlers) || if (pdu->id >= ARRAY_SIZE(pdu_co_handlers) ||
(pdu_co_handlers[pdu->id] == NULL)) { (pdu_co_handlers[pdu->id] == NULL)) {
@ -3269,7 +3262,6 @@ void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq)
} QEMU_PACKED out; } QEMU_PACKED out;
int len; int len;
pdu->s = s;
BUG_ON(pdu->elem.out_num == 0 || pdu->elem.in_num == 0); BUG_ON(pdu->elem.out_num == 0 || pdu->elem.in_num == 0);
QEMU_BUILD_BUG_ON(sizeof out != 7); QEMU_BUILD_BUG_ON(sizeof out != 7);
@ -3283,9 +3275,9 @@ void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq)
pdu->tag = le16_to_cpu(out.tag_le); pdu->tag = le16_to_cpu(out.tag_le);
qemu_co_queue_init(&pdu->complete); qemu_co_queue_init(&pdu->complete);
submit_pdu(s, pdu); submit_pdu(pdu);
} }
free_pdu(s, pdu); free_pdu(pdu);
} }
static void __attribute__((__constructor__)) virtio_9p_set_fd_limit(void) static void __attribute__((__constructor__)) virtio_9p_set_fd_limit(void)