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 <mo...@in.ibm.com>
---
hw/9pfs/virtio-9p-chroot-worker.c | 17 +++++++++++++++++
hw/9pfs/virtio-9p-chroot.h | 1 +
hw/9pfs/virtio-9p-local.c | 17 +++++++++--------
3 files changed, 27 insertions(+), 8 deletions(-)
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 856e9c4..1fa1fde 100644
--- a/hw/9pfs/virtio-9p-chroot.h
+++ b/hw/9pfs/virtio-9p-chroot.h
@@ -10,6 +10,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 7ae21ef..9193687 100644
--- a/hw/9pfs/virtio-9p-local.c
+++ b/hw/9pfs/virtio-9p-local.c
@@ -513,22 +513,23 @@ static int local_truncate(FsContext *ctx, const char
*path, off_t size)
static int local_rename(FsContext *ctx, const char *oldpath,
const char *newpath)
{
+ int err, serrno;
char *tmp;
- int err;
- tmp = qemu_strdup(rpath(ctx, oldpath));
+ if (ctx->fs_sm == SM_PASSTHROUGH) {
+ return passthrough_request(ctx, oldpath, newpath, 0, NULL, T_RENAME);
+ }
+ tmp = qemu_strdup(rpath(ctx, oldpath));
err = rename(tmp, rpath(ctx, newpath));
if (err == -1) {
- int serrno = errno;
- qemu_free(tmp);
+ serrno = errno;
+ }
+ qemu_free(tmp);
+ if (err == -1) {
errno = serrno;
- } else {
- qemu_free(tmp);
}
-
return err;
-
}
static int local_chown(FsContext *fs_ctx, const char *path, FsCred *credp)
--
1.7.4
