diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2010-04-29 17:45:01 +0530 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-05-03 12:17:39 -0500 |
commit | 5bae190082fc24d8881e5db9409fc94f6c46f219 (patch) | |
tree | b3b4d0bbd3939e2fc3753b1620d46abc1c9232d7 /hw/virtio-9p.c | |
parent | 8cf89e007a37fff75c06e5a4564d530e51c1ec98 (diff) | |
download | qemu-5bae190082fc24d8881e5db9409fc94f6c46f219.zip qemu-5bae190082fc24d8881e5db9409fc94f6c46f219.tar.gz qemu-5bae190082fc24d8881e5db9409fc94f6c46f219.tar.bz2 |
virtio-9p: Add P9_TREMOVE support.
Implement P9_TREMOVE support.
This gets file deletion to work.
[mohan@in.ibm.com: Fix truncate to use the relative path]
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/virtio-9p.c')
-rw-r--r-- | hw/virtio-9p.c | 50 |
1 files changed, 48 insertions, 2 deletions
diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c index 3288142..ca8cf6e 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -166,6 +166,11 @@ static int v9fs_do_utime(V9fsState *s, V9fsString *path, return s->ops->utime(&s->ctx, path->data, buf); } +static int v9fs_do_remove(V9fsState *s, V9fsString *path) +{ + return s->ops->remove(&s->ctx, path->data); +} + static int v9fs_do_fsync(V9fsState *s, int fd) { return s->ops->fsync(&s->ctx, fd); @@ -1960,11 +1965,52 @@ static void v9fs_flush(V9fsState *s, V9fsPDU *pdu) } } +typedef struct V9fsRemoveState { + V9fsPDU *pdu; + size_t offset; + V9fsFidState *fidp; +} V9fsRemoveState; + +static void v9fs_remove_post_remove(V9fsState *s, V9fsRemoveState *vs, + int err) +{ + /* For TREMOVE we need to clunk the fid even on failed remove */ + err = free_fid(s, vs->fidp->fid); + if (err < 0) { + goto out; + } + + err = vs->offset; +out: + complete_pdu(s, vs->pdu, err); + qemu_free(vs); +} + static void v9fs_remove(V9fsState *s, V9fsPDU *pdu) { - if (debug_9p_pdu) { - pprint_pdu(pdu); + int32_t fid; + V9fsRemoveState *vs; + int err = 0; + + vs = qemu_malloc(sizeof(*vs)); + vs->pdu = pdu; + vs->offset = 7; + + pdu_unmarshal(vs->pdu, vs->offset, "d", &fid); + + vs->fidp = lookup_fid(s, fid); + if (vs->fidp == NULL) { + err = -EINVAL; + goto out; } + + err = v9fs_do_remove(s, &vs->fidp->path); + v9fs_remove_post_remove(s, vs, err); + return; + +out: + complete_pdu(s, pdu, err); + qemu_free(vs); } typedef struct V9fsWstatState |