From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:44777) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa1f5-000724-Qs for qemu-devel@nongnu.org; Fri, 24 Jun 2011 04:22:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qa1ey-0002TU-Hk for qemu-devel@nongnu.org; Fri, 24 Jun 2011 04:22:47 -0400 Received: from e28smtp01.in.ibm.com ([122.248.162.1]:38232) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa1ex-0002Qq-2U for qemu-devel@nongnu.org; Fri, 24 Jun 2011 04:22:40 -0400 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by e28smtp01.in.ibm.com (8.14.4/8.13.1) with ESMTP id p5O8MUQG008151 for ; Fri, 24 Jun 2011 13:52:30 +0530 Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p5O8MTww2064606 for ; Fri, 24 Jun 2011 13:52:29 +0530 Received: from d28av01.in.ibm.com (loopback [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p5O8MSwO004218 for ; Fri, 24 Jun 2011 13:52:28 +0530 From: "M. Mohan Kumar" Date: Fri, 24 Jun 2011 13:52:18 +0530 Message-Id: <1308903744-2870-10-git-send-email-mohan@in.ibm.com> In-Reply-To: <1308903744-2870-1-git-send-email-mohan@in.ibm.com> References: <1308903744-2870-1-git-send-email-mohan@in.ibm.com> Subject: [Qemu-devel] [V11 09/15] virtio-9p: Rename in chroot environment List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "M. Mohan Kumar" From: "M. Mohan Kumar" 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 --- hw/9pfs/virtio-9p-chroot-worker.c | 17 +++++++++++++++++ hw/9pfs/virtio-9p-chroot.h | 1 + hw/9pfs/virtio-9p-local.c | 3 +++ 3 files changed, 21 insertions(+), 0 deletions(-) diff --git a/hw/9pfs/virtio-9p-chroot-worker.c b/hw/9pfs/virtio-9p-chroot-worker.c index f269c7b..9bb94f2 100644 --- a/hw/9pfs/virtio-9p-chroot-worker.c +++ b/hw/9pfs/virtio-9p-chroot-worker.c @@ -184,6 +184,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; @@ -290,6 +304,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 9d69739..fda60af 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 #define V9FS_FD_VALID INT_MAX diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c index f2d66e1..864a464 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -582,6 +582,9 @@ static int local_rename(FsContext *ctx, const char *oldpath, { char buffer[PATH_MAX], buffer1[PATH_MAX]; + if (ctx->fs_sm == SM_PASSTHROUGH) { + return passthrough_request(ctx, oldpath, newpath, 0, NULL, T_RENAME); + } return rename(rpath(ctx, oldpath, buffer), rpath(ctx, newpath, buffer1)); } -- 1.7.5.4