From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NuqAT-00078z-7Y for qemu-devel@nongnu.org; Thu, 25 Mar 2010 12:44:25 -0400 Received: from [140.186.70.92] (port=50517 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NuqAM-00075E-Kz for qemu-devel@nongnu.org; Thu, 25 Mar 2010 12:44:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NuqAH-00057Y-Bp for qemu-devel@nongnu.org; Thu, 25 Mar 2010 12:44:18 -0400 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:40970) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NuqAG-000579-PS for qemu-devel@nongnu.org; Thu, 25 Mar 2010 12:44:13 -0400 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [202.81.31.247]) by e23smtp09.au.ibm.com (8.14.3/8.13.1) with ESMTP id o2PGiB45028012 for ; Fri, 26 Mar 2010 03:44:11 +1100 Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o2PGc5xf1523766 for ; Fri, 26 Mar 2010 03:38:05 +1100 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id o2PGiA20031347 for ; Fri, 26 Mar 2010 03:44:11 +1100 From: "Aneesh Kumar K.V" Date: Thu, 25 Mar 2010 22:13:20 +0530 Message-Id: <1269535420-31206-13-git-send-email-aneesh.kumar@linux.vnet.ibm.com> In-Reply-To: <1269535420-31206-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1269535420-31206-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH -V3 12/32] virtio-9p: Implement P9_TREMOVE List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: ericvh@gmail.com, aliguori@us.ibm.com, "Aneesh Kumar K.V" , Gautham R Shenoy From: Anthony Liguori This gets file deletion to work [mohan@in.ibm.com: Fix truncate to use the relative path] Signed-off-by: Anthony Liguori Signed-off-by: Gautham R Shenoy Signed-off-by: Aneesh Kumar K.V --- hw/virtio-9p-local.c | 7 ++++++ hw/virtio-9p.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/hw/virtio-9p-local.c b/hw/virtio-9p-local.c index 829e79a..dca6175 100644 --- a/hw/virtio-9p-local.c +++ b/hw/virtio-9p-local.c @@ -245,6 +245,12 @@ static int local_utime(void *opaque, const char *path, return utime(rpath(path), buf); } +static int local_remove(void *opaque, const char *path) +{ + return remove(rpath(path)); +} + + static V9fsPosixFileOperations ops = { .lstat = local_lstat, .setuid = local_setuid, @@ -272,6 +278,7 @@ static V9fsPosixFileOperations ops = { .rename = local_rename, .chown = local_chown, .utime = local_utime, + .remove = local_remove, }; V9fsPosixFileOperations *virtio_9p_init_local(const char *path) diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c index c8995a3..4478e57 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -237,6 +237,11 @@ static int posix_utime(V9fsState *s, V9fsString *path, return s->ops->utime(s->ops->opaque, path->data, buf); } +static int posix_remove(V9fsState *s, V9fsString *path) +{ + return s->ops->remove(s->ops->opaque, path->data); +} + static void v9fs_string_init(V9fsString *str) { str->data = NULL; @@ -1716,10 +1721,55 @@ static void v9fs_flush(V9fsState *s, V9fsPDU *pdu) pprint_pdu(pdu); } +typedef struct V9fsRemoveState { + V9fsPDU *pdu; + size_t offset; + int32_t fid; + V9fsFidState *fidp; +} V9fsRemoveState; + +static void v9fs_remove_post_remove(V9fsState *s, V9fsRemoveState *vs, + int err) +{ + if (err) { + err = -errno; + goto out; + } + + err = free_fid(s, vs->fid); + if (err < 0) + goto out; + + err = vs->offset; +out: + complete_pdu(s, vs->pdu, err); + qemu_free(vs); +} + static void v9fs_remove(V9fsState *s, V9fsPDU *pdu) { - if (debug_9p_pdu) - pprint_pdu(pdu); + V9fsRemoveState *vs; + int err = 0; + + vs = qemu_malloc(sizeof(*vs)); + vs->pdu = pdu; + vs->offset = 7; + + pdu_unmarshal(vs->pdu, vs->offset, "d", &vs->fid); + + vs->fidp = lookup_fid(s, vs->fid); + if (vs->fidp == NULL) { + err = -EINVAL; + goto out; + } + + err = posix_remove(s, &vs->fidp->path); + v9fs_remove_post_remove(s, vs, err); + return; + +out: + complete_pdu(s, pdu, err); + qemu_free(vs); } static mode_t v9mode_to_mode(uint32_t mode, V9fsString *extension) -- 1.7.0.2.323.g0d092