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 <mo...@in.ibm.com> --- 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