Patchwork [V8,09/11] virtio-9p: Add support to rename

login
register
mail settings
Submitter Mohan Kumar M
Date March 9, 2011, 5:15 p.m.
Message ID <1299690960-12007-10-git-send-email-mohan@in.ibm.com>
Download mbox | patch
Permalink /patch/86140/
State New
Headers show

Comments

Mohan Kumar M - March 9, 2011, 5:15 p.m.
Support renaming a file or directory in chroot envirnoment. Add
interfaces for renaming in chroot worker and qemu side.

Signed-off-by: M. Mohan Kumar <mohan@in.ibm.com>
---
 hw/9pfs/virtio-9p-chroot-worker.c |   17 +++++++++++++++++
 hw/9pfs/virtio-9p-chroot.h        |    1 +
 hw/9pfs/virtio-9p-local.c         |   26 +++++++++++++++-----------
 3 files changed, 33 insertions(+), 11 deletions(-)

Patch

diff --git a/hw/9pfs/virtio-9p-chroot-worker.c b/hw/9pfs/virtio-9p-chroot-worker.c
index 40e572c..353aeed 100644
--- a/hw/9pfs/virtio-9p-chroot-worker.c
+++ b/hw/9pfs/virtio-9p-chroot-worker.c
@@ -176,6 +176,20 @@  static int chroot_do_remove(V9fsFileObjectRequest *request)
     return 0;
 }
 
+/*
+ * Rename a file object
+ */
+static int chroot_do_rename(V9fsFileObjectRequest *request)
+{
+    int retval;
+
+    retval = rename(request->path.old_path, request->path.path);
+    if (retval < 0) {
+        return -errno;
+    }
+    return 0;
+}
+
 static void chroot_daemonize(int chroot_sock)
 {
     sigset_t sigset;
@@ -280,6 +294,9 @@  int v9fs_chroot(FsContext *fs_ctx)
         case T_REMOVE:
             retval = chroot_do_remove(&request);
             break;
+        case T_RENAME:
+            retval = chroot_do_rename(&request);
+            break;
         default:
             retval = -1;
             break;
diff --git a/hw/9pfs/virtio-9p-chroot.h b/hw/9pfs/virtio-9p-chroot.h
index 2d7984a..e8251b4 100644
--- a/hw/9pfs/virtio-9p-chroot.h
+++ b/hw/9pfs/virtio-9p-chroot.h
@@ -9,6 +9,7 @@ 
 #define T_SYMLINK   5
 #define T_LINK      6
 #define T_REMOVE    7
+#define T_RENAME    8
 
 union MsgControl {
     struct cmsghdr cmsg;
diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c
index cdbaf6a..cf4792b 100644
--- a/hw/9pfs/virtio-9p-local.c
+++ b/hw/9pfs/virtio-9p-local.c
@@ -519,22 +519,26 @@  static int local_truncate(FsContext *ctx, const char *path, off_t size)
 static int local_rename(FsContext *ctx, const char *oldpath,
                         const char *newpath)
 {
-    char *tmp;
-    int err;
-
-    tmp = qemu_strdup(rpath(ctx, oldpath));
+    int err, serrno;
 
-    err = rename(tmp, rpath(ctx, newpath));
-    if (err == -1) {
-        int serrno = errno;
-        qemu_free(tmp);
-        errno = serrno;
+    if (ctx->fs_sm == SM_PASSTHROUGH) {
+        err = passthrough_request(ctx, oldpath, newpath, 0, NULL, T_RENAME);
+        if (err == -1) {
+            serrno = errno;
+        }
     } else {
+        char *tmp;
+        tmp = qemu_strdup(rpath(ctx, oldpath));
+        err = rename(tmp, rpath(ctx, newpath));
+        if (err == -1) {
+            serrno = errno;
+        }
         qemu_free(tmp);
     }
-
+    if (err == -1) {
+        errno = serrno;
+    }
     return err;
-
 }
 
 static int local_chown(FsContext *fs_ctx, const char *path, FsCred *credp)