mirror of https://gitee.com/openkylin/qemu.git
hw/9pfs: Update v9fs_getattr to use coroutines
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
This commit is contained in:
parent
172198d4db
commit
8db21ce73a
|
@ -1086,7 +1086,7 @@ static int stat_to_v9stat(V9fsState *s, V9fsString *name,
|
||||||
|
|
||||||
|
|
||||||
static void stat_to_v9stat_dotl(V9fsState *s, const struct stat *stbuf,
|
static void stat_to_v9stat_dotl(V9fsState *s, const struct stat *stbuf,
|
||||||
V9fsStatDotl *v9lstat)
|
V9fsStatDotl *v9lstat)
|
||||||
{
|
{
|
||||||
memset(v9lstat, 0, sizeof(*v9lstat));
|
memset(v9lstat, 0, sizeof(*v9lstat));
|
||||||
|
|
||||||
|
@ -1283,57 +1283,38 @@ out:
|
||||||
qemu_free(vs);
|
qemu_free(vs);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void v9fs_getattr_post_lstat(V9fsState *s, V9fsStatStateDotl *vs,
|
|
||||||
int err)
|
|
||||||
{
|
|
||||||
if (err == -1) {
|
|
||||||
err = -errno;
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
stat_to_v9stat_dotl(s, &vs->stbuf, &vs->v9stat_dotl);
|
|
||||||
vs->offset += pdu_marshal(vs->pdu, vs->offset, "A", &vs->v9stat_dotl);
|
|
||||||
err = vs->offset;
|
|
||||||
|
|
||||||
out:
|
|
||||||
complete_pdu(s, vs->pdu, err);
|
|
||||||
qemu_free(vs);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void v9fs_getattr(void *opaque)
|
static void v9fs_getattr(void *opaque)
|
||||||
{
|
{
|
||||||
V9fsPDU *pdu = opaque;
|
|
||||||
V9fsState *s = pdu->s;
|
|
||||||
int32_t fid;
|
int32_t fid;
|
||||||
V9fsStatStateDotl *vs;
|
size_t offset = 7;
|
||||||
ssize_t err = 0;
|
ssize_t retval = 0;
|
||||||
|
struct stat stbuf;
|
||||||
V9fsFidState *fidp;
|
V9fsFidState *fidp;
|
||||||
uint64_t request_mask;
|
uint64_t request_mask;
|
||||||
|
V9fsStatDotl v9stat_dotl;
|
||||||
|
V9fsPDU *pdu = opaque;
|
||||||
|
V9fsState *s = pdu->s;
|
||||||
|
|
||||||
vs = qemu_malloc(sizeof(*vs));
|
pdu_unmarshal(pdu, offset, "dq", &fid, &request_mask);
|
||||||
vs->pdu = pdu;
|
|
||||||
vs->offset = 7;
|
|
||||||
|
|
||||||
memset(&vs->v9stat_dotl, 0, sizeof(vs->v9stat_dotl));
|
|
||||||
|
|
||||||
pdu_unmarshal(vs->pdu, vs->offset, "dq", &fid, &request_mask);
|
|
||||||
|
|
||||||
fidp = lookup_fid(s, fid);
|
fidp = lookup_fid(s, fid);
|
||||||
if (fidp == NULL) {
|
if (fidp == NULL) {
|
||||||
err = -ENOENT;
|
retval = -ENOENT;
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
/* Currently we only support BASIC fields in stat, so there is no
|
* Currently we only support BASIC fields in stat, so there is no
|
||||||
* need to look at request_mask.
|
* need to look at request_mask.
|
||||||
*/
|
*/
|
||||||
err = v9fs_do_lstat(s, &fidp->path, &vs->stbuf);
|
retval = v9fs_co_lstat(s, &fidp->path, &stbuf);
|
||||||
v9fs_getattr_post_lstat(s, vs, err);
|
if (retval < 0) {
|
||||||
return;
|
goto out;
|
||||||
|
}
|
||||||
|
stat_to_v9stat_dotl(s, &stbuf, &v9stat_dotl);
|
||||||
|
retval = offset;
|
||||||
|
retval += pdu_marshal(pdu, offset, "A", &v9stat_dotl);
|
||||||
out:
|
out:
|
||||||
complete_pdu(s, vs->pdu, err);
|
complete_pdu(s, pdu, retval);
|
||||||
qemu_free(vs);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* From Linux kernel code */
|
/* From Linux kernel code */
|
||||||
|
|
|
@ -278,14 +278,6 @@ typedef struct V9fsStatDotl {
|
||||||
uint64_t st_data_version;
|
uint64_t st_data_version;
|
||||||
} V9fsStatDotl;
|
} V9fsStatDotl;
|
||||||
|
|
||||||
typedef struct V9fsStatStateDotl {
|
|
||||||
V9fsPDU *pdu;
|
|
||||||
size_t offset;
|
|
||||||
V9fsStatDotl v9stat_dotl;
|
|
||||||
struct stat stbuf;
|
|
||||||
} V9fsStatStateDotl;
|
|
||||||
|
|
||||||
|
|
||||||
typedef struct V9fsWalkState {
|
typedef struct V9fsWalkState {
|
||||||
V9fsPDU *pdu;
|
V9fsPDU *pdu;
|
||||||
size_t offset;
|
size_t offset;
|
||||||
|
|
Loading…
Reference in New Issue