From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=53663 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q0QZE-0000cU-OS for qemu-devel@nongnu.org; Thu, 17 Mar 2011 23:41:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q0QZ7-00050Q-9A for qemu-devel@nongnu.org; Thu, 17 Mar 2011 23:41:30 -0400 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:33412) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q0QZ6-0004zd-MI for qemu-devel@nongnu.org; Thu, 17 Mar 2011 23:41:29 -0400 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [202.81.31.247]) by e23smtp09.au.ibm.com (8.14.4/8.13.1) with ESMTP id p2I3SGYl008587 for ; Fri, 18 Mar 2011 14:28:16 +1100 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p2I3SGL82289782 for ; Fri, 18 Mar 2011 14:28:16 +1100 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p2I3SGjs027498 for ; Fri, 18 Mar 2011 14:28:16 +1100 From: "M. Mohan Kumar" Date: Fri, 18 Mar 2011 08:57:57 +0530 Message-Id: <1300418881-20972-10-git-send-email-mohan@in.ibm.com> In-Reply-To: <1300418881-20972-1-git-send-email-mohan@in.ibm.com> References: <1300418881-20972-1-git-send-email-mohan@in.ibm.com> Subject: [Qemu-devel] [V9 PATCH 09/13] virtio-9p: Add support to rename List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Stefan Hajnoczi 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 | 26 +++++++++++++++----------- 3 files changed, 33 insertions(+), 11 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 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 c255cbd..48ca7ab 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -526,22 +526,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) -- 1.7.3.4