From patchwork Wed Mar 9 17:15:58 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: 86140 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E3787B6F2B for ; Thu, 10 Mar 2011 04:47:14 +1100 (EST) Received: from localhost ([127.0.0.1]:48250 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PxNTY-0002zZ-W3 for incoming@patchwork.ozlabs.org; Wed, 09 Mar 2011 12:47:09 -0500 Received: from [140.186.70.92] (port=47764 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PxN9L-0001nR-CF for qemu-devel@nongnu.org; Wed, 09 Mar 2011 12:26:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PxN13-0005gy-Ji for qemu-devel@nongnu.org; Wed, 09 Mar 2011 12:17:42 -0500 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:40576) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PxN12-0005gm-QW for qemu-devel@nongnu.org; Wed, 09 Mar 2011 12:17:41 -0500 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by e28smtp04.in.ibm.com (8.14.4/8.13.1) with ESMTP id p29HHYef019493 for ; Wed, 9 Mar 2011 22:47:34 +0530 Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p29HHSqm2482204 for ; Wed, 9 Mar 2011 22:47:34 +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 p29HG8Mr020248 for ; Wed, 9 Mar 2011 22:46:08 +0530 Received: from explorer.in.ibm.com ([9.124.208.3]) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p29HG4wE020116; Wed, 9 Mar 2011 22:46:07 +0530 From: "M. Mohan Kumar" To: qemu-devel@nongnu.org, Stefan Hajnoczi Date: Wed, 9 Mar 2011 22:45:58 +0530 Message-Id: <1299690960-12007-10-git-send-email-mohan@in.ibm.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1299690960-12007-1-git-send-email-mohan@in.ibm.com> References: <1299690960-12007-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.4 Cc: Subject: [Qemu-devel] [V8 PATCH 09/11] virtio-9p: Add support to rename X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: 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 | 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 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)