From patchwork Fri Jun 24 08:22:17 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: 101749 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 8B204B6F85 for ; Fri, 24 Jun 2011 18:56:52 +1000 (EST) Received: from localhost ([::1]:59026 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa2C0-0005VG-Dg for incoming@patchwork.ozlabs.org; Fri, 24 Jun 2011 04:56:48 -0400 Received: from eggs.gnu.org ([140.186.70.92]:44628) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa1ex-0006zX-Fq for qemu-devel@nongnu.org; Fri, 24 Jun 2011 04:22:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qa1eu-0002Rh-Ku for qemu-devel@nongnu.org; Fri, 24 Jun 2011 04:22:38 -0400 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:43505) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa1et-0002R7-PS for qemu-devel@nongnu.org; Fri, 24 Jun 2011 04:22:36 -0400 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 p5O8MT7d020266 for ; Fri, 24 Jun 2011 13:52:29 +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 p5O8MTxk3293426 for ; Fri, 24 Jun 2011 13:52:29 +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 p5O8MS6R004209 for ; Fri, 24 Jun 2011 13:52:28 +0530 Received: from virtfs.in.ibm.com ([9.124.35.90]) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p5O8MS7j004156; Fri, 24 Jun 2011 13:52:28 +0530 From: "M. Mohan Kumar" To: qemu-devel@nongnu.org Date: Fri, 24 Jun 2011 13:52:17 +0530 Message-Id: <1308903744-2870-9-git-send-email-mohan@in.ibm.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1308903744-2870-1-git-send-email-mohan@in.ibm.com> References: <1308903744-2870-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: "M. Mohan Kumar" Subject: [Qemu-devel] [V11 08/15] virtio-9p: Removing file or directory 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 From: "M. Mohan Kumar" 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 a1eff5f..f2d66e1 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -617,6 +617,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)); }