mirror of https://github.com/xemu-project/xemu.git
qemu: virtio-9p: Implement statfs support in server
Implement statfs support in qemu server based on Sripathi's initial statfs patch. Signed-off-by: M. Mohan Kumar <mohan@in.ibm.com> Signed-off-by: Sripathi Kodi <sripathik@in.ibm.com> Signed-off-by: Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
This commit is contained in:
parent
84151514e4
commit
be940c8716
|
@ -74,6 +74,7 @@ typedef struct FileOperations
|
||||||
int (*rename)(FsContext *, const char *, const char *);
|
int (*rename)(FsContext *, const char *, const char *);
|
||||||
int (*truncate)(FsContext *, const char *, off_t);
|
int (*truncate)(FsContext *, const char *, off_t);
|
||||||
int (*fsync)(FsContext *, int);
|
int (*fsync)(FsContext *, int);
|
||||||
|
int (*statfs)(FsContext *s, const char *path, struct statfs *stbuf);
|
||||||
void *opaque;
|
void *opaque;
|
||||||
} FileOperations;
|
} FileOperations;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -466,6 +466,11 @@ static int local_fsync(FsContext *ctx, int fd)
|
||||||
return fsync(fd);
|
return fsync(fd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int local_statfs(FsContext *s, const char *path, struct statfs *stbuf)
|
||||||
|
{
|
||||||
|
return statfs(rpath(s, path), stbuf);
|
||||||
|
}
|
||||||
|
|
||||||
FileOperations local_ops = {
|
FileOperations local_ops = {
|
||||||
.lstat = local_lstat,
|
.lstat = local_lstat,
|
||||||
.readlink = local_readlink,
|
.readlink = local_readlink,
|
||||||
|
@ -493,4 +498,5 @@ FileOperations local_ops = {
|
||||||
.utime = local_utime,
|
.utime = local_utime,
|
||||||
.remove = local_remove,
|
.remove = local_remove,
|
||||||
.fsync = local_fsync,
|
.fsync = local_fsync,
|
||||||
|
.statfs = local_statfs,
|
||||||
};
|
};
|
||||||
|
|
|
@ -2144,9 +2144,72 @@ out:
|
||||||
qemu_free(vs);
|
qemu_free(vs);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int v9fs_do_statfs(V9fsState *s, V9fsString *path, struct statfs *stbuf)
|
||||||
|
{
|
||||||
|
return s->ops->statfs(&s->ctx, path->data, stbuf);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void v9fs_statfs_post_statfs(V9fsState *s, V9fsStatfsState *vs, int err)
|
||||||
|
{
|
||||||
|
if (err) {
|
||||||
|
err = -errno;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
vs->v9statfs.f_type = vs->stbuf.f_type;
|
||||||
|
vs->v9statfs.f_bsize = vs->stbuf.f_bsize;
|
||||||
|
vs->v9statfs.f_blocks = vs->stbuf.f_blocks;
|
||||||
|
vs->v9statfs.f_bfree = vs->stbuf.f_bfree;
|
||||||
|
vs->v9statfs.f_bavail = vs->stbuf.f_bavail;
|
||||||
|
vs->v9statfs.f_files = vs->stbuf.f_files;
|
||||||
|
vs->v9statfs.f_ffree = vs->stbuf.f_ffree;
|
||||||
|
vs->v9statfs.fsid_val = (unsigned int) vs->stbuf.f_fsid.__val[0] |
|
||||||
|
(unsigned long long)vs->stbuf.f_fsid.__val[1] << 32;
|
||||||
|
vs->v9statfs.f_namelen = vs->stbuf.f_namelen;
|
||||||
|
|
||||||
|
vs->offset += pdu_marshal(vs->pdu, vs->offset, "ddqqqqqqd",
|
||||||
|
vs->v9statfs.f_type, vs->v9statfs.f_bsize, vs->v9statfs.f_blocks,
|
||||||
|
vs->v9statfs.f_bfree, vs->v9statfs.f_bavail, vs->v9statfs.f_files,
|
||||||
|
vs->v9statfs.f_ffree, vs->v9statfs.fsid_val,
|
||||||
|
vs->v9statfs.f_namelen);
|
||||||
|
|
||||||
|
out:
|
||||||
|
complete_pdu(s, vs->pdu, vs->offset);
|
||||||
|
qemu_free(vs);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void v9fs_statfs(V9fsState *s, V9fsPDU *pdu)
|
||||||
|
{
|
||||||
|
V9fsStatfsState *vs;
|
||||||
|
ssize_t err = 0;
|
||||||
|
|
||||||
|
vs = qemu_malloc(sizeof(*vs));
|
||||||
|
vs->pdu = pdu;
|
||||||
|
vs->offset = 7;
|
||||||
|
|
||||||
|
memset(&vs->v9statfs, 0, sizeof(vs->v9statfs));
|
||||||
|
|
||||||
|
pdu_unmarshal(vs->pdu, vs->offset, "d", &vs->fid);
|
||||||
|
|
||||||
|
vs->fidp = lookup_fid(s, vs->fid);
|
||||||
|
if (vs->fidp == NULL) {
|
||||||
|
err = -ENOENT;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
err = v9fs_do_statfs(s, &vs->fidp->path, &vs->stbuf);
|
||||||
|
v9fs_statfs_post_statfs(s, vs, err);
|
||||||
|
return;
|
||||||
|
|
||||||
|
out:
|
||||||
|
complete_pdu(s, vs->pdu, err);
|
||||||
|
qemu_free(vs);
|
||||||
|
}
|
||||||
|
|
||||||
typedef void (pdu_handler_t)(V9fsState *s, V9fsPDU *pdu);
|
typedef void (pdu_handler_t)(V9fsState *s, V9fsPDU *pdu);
|
||||||
|
|
||||||
static pdu_handler_t *pdu_handlers[] = {
|
static pdu_handler_t *pdu_handlers[] = {
|
||||||
|
[P9_TSTATFS] = v9fs_statfs,
|
||||||
[P9_TVERSION] = v9fs_version,
|
[P9_TVERSION] = v9fs_version,
|
||||||
[P9_TATTACH] = v9fs_attach,
|
[P9_TATTACH] = v9fs_attach,
|
||||||
[P9_TSTAT] = v9fs_stat,
|
[P9_TSTAT] = v9fs_stat,
|
||||||
|
|
|
@ -13,6 +13,8 @@
|
||||||
#define VIRTIO_9P_MOUNT_TAG 0
|
#define VIRTIO_9P_MOUNT_TAG 0
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
|
P9_TSTATFS = 8,
|
||||||
|
P9_RSTATFS,
|
||||||
P9_TVERSION = 100,
|
P9_TVERSION = 100,
|
||||||
P9_RVERSION,
|
P9_RVERSION,
|
||||||
P9_TAUTH = 102,
|
P9_TAUTH = 102,
|
||||||
|
@ -252,6 +254,28 @@ struct virtio_9p_config
|
||||||
uint8_t tag[0];
|
uint8_t tag[0];
|
||||||
} __attribute__((packed));
|
} __attribute__((packed));
|
||||||
|
|
||||||
|
typedef struct V9fsStatfs
|
||||||
|
{
|
||||||
|
uint32_t f_type;
|
||||||
|
uint32_t f_bsize;
|
||||||
|
uint64_t f_blocks;
|
||||||
|
uint64_t f_bfree;
|
||||||
|
uint64_t f_bavail;
|
||||||
|
uint64_t f_files;
|
||||||
|
uint64_t f_ffree;
|
||||||
|
uint64_t fsid_val;
|
||||||
|
uint32_t f_namelen;
|
||||||
|
} V9fsStatfs;
|
||||||
|
|
||||||
|
typedef struct V9fsStatfsState {
|
||||||
|
V9fsPDU *pdu;
|
||||||
|
size_t offset;
|
||||||
|
int32_t fid;
|
||||||
|
V9fsStatfs v9statfs;
|
||||||
|
V9fsFidState *fidp;
|
||||||
|
struct statfs stbuf;
|
||||||
|
} V9fsStatfsState;
|
||||||
|
|
||||||
extern size_t pdu_packunpack(void *addr, struct iovec *sg, int sg_count,
|
extern size_t pdu_packunpack(void *addr, struct iovec *sg, int sg_count,
|
||||||
size_t offset, size_t size, int pack);
|
size_t offset, size_t size, int pack);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue