From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=40537 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q0QMQ-0007be-Lu for qemu-devel@nongnu.org; Thu, 17 Mar 2011 23:28:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q0QMP-0001pz-1m for qemu-devel@nongnu.org; Thu, 17 Mar 2011 23:28:22 -0400 Received: from e23smtp04.au.ibm.com ([202.81.31.146]:35749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q0QMO-0001ow-Co for qemu-devel@nongnu.org; Thu, 17 Mar 2011 23:28:21 -0400 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [202.81.31.245]) by e23smtp04.au.ibm.com (8.14.4/8.13.1) with ESMTP id p2I3Me6O003680 for ; Fri, 18 Mar 2011 14:22:40 +1100 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p2I3SFV81478682 for ; Fri, 18 Mar 2011 14:28:15 +1100 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p2I3SEiE027469 for ; Fri, 18 Mar 2011 14:28:14 +1100 From: "M. Mohan Kumar" Date: Fri, 18 Mar 2011 08:57:56 +0530 Message-Id: <1300418881-20972-9-git-send-email-mohan@in.ibm.com> In-Reply-To: <1300418881-20972-1-git-send-email-mohan@in.ibm.com> References: <1300418881-20972-1-git-send-email-mohan@in.ibm.com> Subject: [Qemu-devel] [V9 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 | 34 ++++++++++++++++++++++++++-------- hw/9pfs/virtio-9p-chroot.h | 1 + hw/9pfs/virtio-9p-local.c | 6 +++++- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/hw/9pfs/virtio-9p-chroot-worker.c b/hw/9pfs/virtio-9p-chroot-worker.c index fcc0be1..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; @@ -199,7 +214,7 @@ int v9fs_chroot(FsContext *fs_ctx) V9fsFileObjectRequest request; pid_t pid; uint32_t code; - int fd, valid_fd; + int retval, valid_fd; if (socketpair(PF_UNIX, SOCK_STREAM, 0, fd_pair) < 0) { error_report("socketpair %s", strerror(errno)); @@ -245,14 +260,14 @@ int v9fs_chroot(FsContext *fs_ctx) } switch (request.data.type) { case T_OPEN: - fd = chroot_do_open(&request); - if (fd >= 0) { + retval = chroot_do_open(&request); + if (retval >= 0) { valid_fd = 1; } break; case T_CREATE: - fd = chroot_do_create(&request); - if (fd >= 0) { + retval = chroot_do_create(&request); + if (retval >= 0) { valid_fd = 1; } break; @@ -260,12 +275,15 @@ int v9fs_chroot(FsContext *fs_ctx) case T_SYMLINK: case T_LINK: case T_MKNOD: - fd = chroot_do_create_special(&request); + retval = chroot_do_create_special(&request); + break; + case T_REMOVE: + retval = chroot_do_remove(&request); break; default: - fd = -1; + retval = -1; break; } - chroot_sendfd(chroot_sock, fd, valid_fd); + chroot_sendfd(chroot_sock, retval, valid_fd); } } diff --git a/hw/9pfs/virtio-9p-chroot.h b/hw/9pfs/virtio-9p-chroot.h index b2db276..2d7984a 100644 --- a/hw/9pfs/virtio-9p-chroot.h +++ b/hw/9pfs/virtio-9p-chroot.h @@ -8,6 +8,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 66ba53b..c255cbd 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -566,7 +566,11 @@ static int local_utimensat(FsContext *s, const char *path, static int local_remove(FsContext *ctx, const char *path) { - return remove(rpath(ctx, path)); + if (ctx->fs_sm == SM_PASSTHROUGH) { + return passthrough_request(ctx, NULL, path, 0, NULL, T_REMOVE); + } else { + return remove(rpath(ctx, path)); + } } static int local_fsync(FsContext *ctx, int fd, int datasync) -- 1.7.3.4