From patchwork Mon Sep 5 16:18:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mohan Kumar M X-Patchwork-Id: 113403 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3CFEAB6F7C for ; Tue, 6 Sep 2011 02:38:49 +1000 (EST) Received: from localhost ([::1]:35816 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0btg-0007iy-Ov for incoming@patchwork.ozlabs.org; Mon, 05 Sep 2011 12:19:44 -0400 Received: from eggs.gnu.org ([140.186.70.92]:54675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0bsj-0005bN-4u for qemu-devel@nongnu.org; Mon, 05 Sep 2011 12:18:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R0bsi-0005Dt-5U for qemu-devel@nongnu.org; Mon, 05 Sep 2011 12:18:44 -0400 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:42776) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0bsh-0005DH-DJ for qemu-devel@nongnu.org; Mon, 05 Sep 2011 12:18:43 -0400 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by e28smtp07.in.ibm.com (8.14.4/8.13.1) with ESMTP id p85GIdD5025778 for ; Mon, 5 Sep 2011 21:48:39 +0530 Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p85GIdsr2994318 for ; Mon, 5 Sep 2011 21:48:39 +0530 Received: from d28av05.in.ibm.com (loopback [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p85GIdN8029200 for ; Tue, 6 Sep 2011 02:18:39 +1000 Received: from explorer.in.ibm.com ([9.79.187.208]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p85GIbFu029092; Tue, 6 Sep 2011 02:18:39 +1000 From: "M. Mohan Kumar" To: qemu-devel@nongnu.org, Anthony Liguori , Stefan Hajnoczi Date: Mon, 5 Sep 2011 21:48:30 +0530 Message-Id: <1315239516-4451-10-git-send-email-mohan@in.ibm.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1315239516-4451-1-git-send-email-mohan@in.ibm.com> References: <1315239516-4451-1-git-send-email-mohan@in.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 122.248.162.7 Subject: [Qemu-devel] [PATCH V12 09/15] hw/9pfs: Rename in chroot environment X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 9d5354a..3b97f51 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -602,6 +602,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)); }