[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/17] virtio-9p: Implement P9_TREMOVE
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [PATCH 12/17] virtio-9p: Implement P9_TREMOVE |
Date: |
Wed, 3 Mar 2010 13:01:09 -0600 |
This gets file deletion to work
address@hidden: Fix truncate to use the relative path]
Signed-off-by: Anthony Liguori <address@hidden>
Signed-off-by: Gautham R Shenoy <address@hidden>
Signed-off-by: Aneesh Kumar K.V <address@hidden>
---
hw/virtio-9p-local.c | 7 ++++++
hw/virtio-9p.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/hw/virtio-9p-local.c b/hw/virtio-9p-local.c
index 0a9f111..43867be 100644
--- a/hw/virtio-9p-local.c
+++ b/hw/virtio-9p-local.c
@@ -245,6 +245,12 @@ static int local_utime(void *opaque, const char *path,
return utime(rpath(path), buf);
}
+static int local_remove(void *opaque, const char *path)
+{
+ return remove(rpath(path));
+}
+
+
static V9fsPosixFileOperations ops = {
.lstat = local_lstat,
.setuid = local_setuid,
@@ -272,6 +278,7 @@ static V9fsPosixFileOperations ops = {
.rename = local_rename,
.chown = local_chown,
.utime = local_utime,
+ .remove = local_remove,
};
V9fsPosixFileOperations *virtio_9p_init_local(const char *path)
diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c
index 836d65b..50ee82a 100644
--- a/hw/virtio-9p.c
+++ b/hw/virtio-9p.c
@@ -237,6 +237,11 @@ static int posix_utime(V9fsState *s, V9fsString *path,
return s->ops->utime(s->ops->opaque, path->data, buf);
}
+static int posix_remove(V9fsState *s, V9fsString *path)
+{
+ return s->ops->remove(s->ops->opaque, path->data);
+}
+
static void v9fs_string_init(V9fsString *str)
{
str->data = NULL;
@@ -1719,10 +1724,55 @@ static void v9fs_flush(V9fsState *s, V9fsPDU *pdu)
pprint_pdu(pdu);
}
+typedef struct V9fsRemoveState {
+ V9fsPDU *pdu;
+ size_t offset;
+ int32_t fid;
+ V9fsFidState *fidp;
+} V9fsRemoveState;
+
+static void v9fs_remove_post_remove(V9fsState *s, V9fsRemoveState *vs,
+ int err)
+{
+ if (err) {
+ err = -errno;
+ goto out;
+ }
+
+ err = free_fid(s, vs->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);
+ V9fsRemoveState *vs;
+ int err = 0;
+
+ vs = qemu_malloc(sizeof(*vs));
+ vs->pdu = pdu;
+ vs->offset = 7;
+
+ pdu_unmarshal(vs->pdu, vs->offset, "d", &vs->fid);
+
+ vs->fidp = lookup_fid(s, vs->fid);
+ if (vs->fidp == NULL) {
+ err = -EINVAL;
+ goto out;
+ }
+
+ err = posix_remove(s, &vs->fidp->path);
+ v9fs_remove_post_remove(s, vs, err);
+ return;
+
+out:
+ complete_pdu(s, pdu, err);
+ qemu_free(vs);
}
static mode_t v9mode_to_mode(uint32_t mode, V9fsString *extension)
--
1.6.5.2
- [Qemu-devel] [PATCH 05/17] virtio-9p: Implement P9_TWALK, (continued)
- [Qemu-devel] [PATCH 05/17] virtio-9p: Implement P9_TWALK, Anthony Liguori, 2010/03/03
- [Qemu-devel] [PATCH 03/17] virtio-9p: Implement P9_TATTACH, Anthony Liguori, 2010/03/03
- [Qemu-devel] [PATCH 16/17] virtio-9p: Add support for hardlink, Anthony Liguori, 2010/03/03
- [Qemu-devel] [PATCH 07/17] virtio-9p: Implement P9_TREAD, Anthony Liguori, 2010/03/03
- [Qemu-devel] [PATCH 14/17] virtio-9p: Add multiple mount point support, Anthony Liguori, 2010/03/03
- [Qemu-devel] [PATCH 17/17] Implement sync support in 9p server, Anthony Liguori, 2010/03/03
- [Qemu-devel] [PATCH 11/17] virtio-9p: Implement P9_TWSTAT, Anthony Liguori, 2010/03/03
- [Qemu-devel] [PATCH 00/17][RFC] virtio-9p: paravirtual filesystem passthrough, Anthony Liguori, 2010/03/03
- [Qemu-devel] [PATCH 13/17] virtio-9p: Implement P9_TFLUSH, Anthony Liguori, 2010/03/03
- [Qemu-devel] [PATCH 09/17] virtio-9p: Implement P9_TWRITE, Anthony Liguori, 2010/03/03
- [Qemu-devel] [PATCH 12/17] virtio-9p: Implement P9_TREMOVE,
Anthony Liguori <=
- [Qemu-devel] [PATCH 15/17] virtio-9p: Use little endian format on virtio, Anthony Liguori, 2010/03/03