From a6568fe27fdb50a46109b48612128cf712e60130 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Thu, 29 Apr 2010 17:44:55 +0530 Subject: virtio-9p: Add P9_TOPEN support. Implement P9_TOPEN support. Signed-off-by: Anthony Liguori Signed-off-by: Aneesh Kumar K.V Signed-off-by: Anthony Liguori --- hw/file-op-9p.h | 2 + hw/virtio-9p-local.c | 12 ++++ hw/virtio-9p.c | 153 +++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 162 insertions(+), 5 deletions(-) diff --git a/hw/file-op-9p.h b/hw/file-op-9p.h index 461df9eeb4..715f2d0f89 100644 --- a/hw/file-op-9p.h +++ b/hw/file-op-9p.h @@ -32,6 +32,8 @@ typedef struct FileOperations int (*setuid)(FsContext *, uid_t); int (*close)(FsContext *, int); int (*closedir)(FsContext *, DIR *); + DIR *(*opendir)(FsContext *, const char *); + int (*open)(FsContext *, const char *, int); void *opaque; } FileOperations; #endif diff --git a/hw/virtio-9p-local.c b/hw/virtio-9p-local.c index 880cd0a981..3788d4e03d 100644 --- a/hw/virtio-9p-local.c +++ b/hw/virtio-9p-local.c @@ -86,10 +86,22 @@ static int local_closedir(FsContext *ctx, DIR *dir) return closedir(dir); } +static int local_open(FsContext *ctx, const char *path, int flags) +{ + return open(rpath(ctx, path), flags); +} + +static DIR *local_opendir(FsContext *ctx, const char *path) +{ + return opendir(rpath(ctx, path)); +} + FileOperations local_ops = { .lstat = local_lstat, .setuid = local_setuid, .readlink = local_readlink, .close = local_close, .closedir = local_closedir, + .open = local_open, + .opendir = local_opendir, }; diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c index 18811c3f55..e98da1b441 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -56,6 +56,16 @@ static int v9fs_do_closedir(V9fsState *s, DIR *dir) return s->ops->closedir(&s->ctx, dir); } +static int v9fs_do_open(V9fsState *s, V9fsString *path, int flags) +{ + return s->ops->open(&s->ctx, path->data, flags); +} + +static DIR *v9fs_do_opendir(V9fsState *s, V9fsString *path) +{ + return s->ops->opendir(&s->ctx, path->data); +} + static void v9fs_string_init(V9fsString *str) { str->data = NULL; @@ -1129,17 +1139,150 @@ out: v9fs_walk_complete(s, vs, err); } -static void v9fs_clunk(V9fsState *s, V9fsPDU *pdu) +typedef struct V9fsOpenState { + V9fsPDU *pdu; + size_t offset; + int8_t mode; + V9fsFidState *fidp; + V9fsQID qid; + struct stat stbuf; + +} V9fsOpenState; + +enum { + Oread = 0x00, + Owrite = 0x01, + Ordwr = 0x02, + Oexec = 0x03, + Oexcl = 0x04, + Otrunc = 0x10, + Orexec = 0x20, + Orclose = 0x40, + Oappend = 0x80, +}; + +static int omode_to_uflags(int8_t mode) { - if (debug_9p_pdu) { - pprint_pdu(pdu); + int ret = 0; + + switch (mode & 3) { + case Oread: + ret = O_RDONLY; + break; + case Ordwr: + ret = O_RDWR; + break; + case Owrite: + ret = O_WRONLY; + break; + case Oexec: + ret = O_RDONLY; + break; } + + if (mode & Otrunc) { + ret |= O_TRUNC; + } + + if (mode & Oappend) { + ret |= O_APPEND; + } + + if (mode & Oexcl) { + ret |= O_EXCL; + } + + return ret; +} + +static void v9fs_open_post_opendir(V9fsState *s, V9fsOpenState *vs, int err) +{ + if (vs->fidp->dir == NULL) { + err = -errno; + goto out; + } + + vs->offset += pdu_marshal(vs->pdu, vs->offset, "Qd", &vs->qid, 0); + err = vs->offset; +out: + complete_pdu(s, vs->pdu, err); + qemu_free(vs); + +} + +static void v9fs_open_post_open(V9fsState *s, V9fsOpenState *vs, int err) +{ + if (vs->fidp->fd == -1) { + err = -errno; + goto out; + } + + vs->offset += pdu_marshal(vs->pdu, vs->offset, "Qd", &vs->qid, 0); + err = vs->offset; +out: + complete_pdu(s, vs->pdu, err); + qemu_free(vs); +} + +static void v9fs_open_post_lstat(V9fsState *s, V9fsOpenState *vs, int err) +{ + if (err) { + err = -errno; + goto out; + } + + stat_to_qid(&vs->stbuf, &vs->qid); + + if (S_ISDIR(vs->stbuf.st_mode)) { + vs->fidp->dir = v9fs_do_opendir(s, &vs->fidp->path); + v9fs_open_post_opendir(s, vs, err); + } else { + vs->fidp->fd = v9fs_do_open(s, &vs->fidp->path, + omode_to_uflags(vs->mode)); + v9fs_open_post_open(s, vs, err); + } + return; +out: + complete_pdu(s, vs->pdu, err); + qemu_free(vs); } static void v9fs_open(V9fsState *s, V9fsPDU *pdu) -{ if (debug_9p_pdu) { +{ + int32_t fid; + V9fsOpenState *vs; + ssize_t err = 0; + + + vs = qemu_malloc(sizeof(*vs)); + vs->pdu = pdu; + vs->offset = 7; + + pdu_unmarshal(vs->pdu, vs->offset, "db", &fid, &vs->mode); + + vs->fidp = lookup_fid(s, fid); + if (vs->fidp == NULL) { + err = -ENOENT; + goto out; + } + + BUG_ON(vs->fidp->fd != -1); + BUG_ON(vs->fidp->dir); + + err = v9fs_do_lstat(s, &vs->fidp->path, &vs->stbuf); + + v9fs_open_post_lstat(s, vs, err); + return; +out: + complete_pdu(s, pdu, err); + qemu_free(vs); +} + +static void v9fs_clunk(V9fsState *s, V9fsPDU *pdu) +{ + if (debug_9p_pdu) { pprint_pdu(pdu); - } + } } static void v9fs_read(V9fsState *s, V9fsPDU *pdu) -- cgit v1.2.3