From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:54749) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0bsl-0005bk-1V for qemu-devel@nongnu.org; Mon, 05 Sep 2011 12:18:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R0bsj-0005Es-Nk for qemu-devel@nongnu.org; Mon, 05 Sep 2011 12:18:47 -0400 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:54425) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0bsj-0005DO-5B for qemu-devel@nongnu.org; Mon, 05 Sep 2011 12:18:45 -0400 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by e28smtp03.in.ibm.com (8.14.4/8.13.1) with ESMTP id p85GIdAY027605 for ; Mon, 5 Sep 2011 21:48:39 +0530 Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p85GIdhH3604712 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 p85GIdSw029190 for ; Tue, 6 Sep 2011 02:18:39 +1000 From: "M. Mohan Kumar" Date: Mon, 5 Sep 2011 21:48:29 +0530 Message-Id: <1315239516-4451-9-git-send-email-mohan@in.ibm.com> In-Reply-To: <1315239516-4451-1-git-send-email-mohan@in.ibm.com> References: <1315239516-4451-1-git-send-email-mohan@in.ibm.com> Subject: [Qemu-devel] [PATCH V12 08/15] hw/9pfs: Removing file or directory in chroot environment List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Anthony Liguori , 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 | 4 ++++ 3 files changed, 23 insertions(+), 0 deletions(-) diff --git a/hw/9pfs/virtio-9p-chroot-worker.c b/hw/9pfs/virtio-9p-chroot-worker.c index 10f290d..f269c7b 100644 --- a/hw/9pfs/virtio-9p-chroot-worker.c +++ b/hw/9pfs/virtio-9p-chroot-worker.c @@ -169,6 +169,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; @@ -272,6 +287,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 9075361..9d69739 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 #define V9FS_FD_VALID INT_MAX diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c index 86eb81a..9d5354a 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -637,6 +637,10 @@ static int local_utimensat(FsContext *s, V9fsPath *fs_path, static int local_remove(FsContext *ctx, const char *path) { char buffer[PATH_MAX]; + + if (ctx->fs_sm == SM_PASSTHROUGH) { + return passthrough_request(ctx, NULL, path, 0, NULL, T_REMOVE); + } return remove(rpath(ctx, path, buffer)); } -- 1.7.6