From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=51444 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q5DDV-0006Zc-NE for qemu-devel@nongnu.org; Thu, 31 Mar 2011 04:26:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q5DDT-0006X8-Lx for qemu-devel@nongnu.org; Thu, 31 Mar 2011 04:26:56 -0400 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:54325) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q5DDS-0006WQ-Ut for qemu-devel@nongnu.org; Thu, 31 Mar 2011 04:26:55 -0400 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by e28smtp04.in.ibm.com (8.14.4/8.13.1) with ESMTP id p2V8Lfkd023681 for ; Thu, 31 Mar 2011 13:51:41 +0530 Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p2V8LfkJ3596454 for ; Thu, 31 Mar 2011 13:51:41 +0530 Received: from d28av04.in.ibm.com (loopback [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p2V8Lfap002849 for ; Thu, 31 Mar 2011 19:21:41 +1100 From: "M. Mohan Kumar" Date: Thu, 31 Mar 2011 13:51:35 +0530 Message-Id: <1301559700-6742-9-git-send-email-mohan@in.ibm.com> In-Reply-To: <1301559700-6742-1-git-send-email-mohan@in.ibm.com> References: <1301559700-6742-1-git-send-email-mohan@in.ibm.com> Subject: [Qemu-devel] [V10 PATCH 08/13] virtio-9p: Add support for removing file or directory List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Stefan Hajnoczi Support for removing file or directory in chroot environment. Add interfaces to remove file/directory in chroot worker and qemu side. Signed-off-by: M. Mohan Kumar --- hw/9pfs/virtio-9p-chroot-worker.c | 18 ++++++++++++++++++ hw/9pfs/virtio-9p-chroot.h | 1 + hw/9pfs/virtio-9p-local.c | 3 +++ 3 files changed, 22 insertions(+), 0 deletions(-) diff --git a/hw/9pfs/virtio-9p-chroot-worker.c b/hw/9pfs/virtio-9p-chroot-worker.c index fc05fd0..40e572c 100644 --- a/hw/9pfs/virtio-9p-chroot-worker.c +++ b/hw/9pfs/virtio-9p-chroot-worker.c @@ -161,6 +161,21 @@ unset_uid: return retval; } +/* + * Remove a file object + * Returns 0 on success and -errno on failure + */ +static int chroot_do_remove(V9fsFileObjectRequest *request) +{ + int retval; + + retval = remove(request->path.path); + if (retval < 0) { + return -errno; + } + return 0; +} + static void chroot_daemonize(int chroot_sock) { sigset_t sigset; @@ -262,6 +277,9 @@ int v9fs_chroot(FsContext *fs_ctx) case T_MKNOD: retval = chroot_do_create_special(&request); break; + case T_REMOVE: + retval = chroot_do_remove(&request); + break; default: retval = -1; break; diff --git a/hw/9pfs/virtio-9p-chroot.h b/hw/9pfs/virtio-9p-chroot.h index 2192a05..856e9c4 100644 --- a/hw/9pfs/virtio-9p-chroot.h +++ b/hw/9pfs/virtio-9p-chroot.h @@ -9,6 +9,7 @@ #define T_MKNOD 4 #define T_SYMLINK 5 #define T_LINK 6 +#define T_REMOVE 7 union MsgControl { struct cmsghdr cmsg; diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c index 2ad2f00..7ae21ef 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -553,6 +553,9 @@ static int local_utimensat(FsContext *s, const char *path, static int local_remove(FsContext *ctx, const char *path) { + if (ctx->fs_sm == SM_PASSTHROUGH) { + return passthrough_request(ctx, NULL, path, 0, NULL, T_REMOVE); + } return remove(rpath(ctx, path)); } -- 1.7.4