All of lore.kernel.org
 help / color / mirror / Atom feed
From: Li Qiang <liq3ea@gmail.com>
To: groug@kaod.org, qemu-devel@nongnu.org
Cc: liqiang6-s@360.cn, Li Qiang <liq3ea@gmail.com>
Subject: [Qemu-devel] [PATCH v2 1/3] 9pfs: add cleanup operation in FileOperations
Date: Mon, 14 Nov 2016 21:13:51 -0500	[thread overview]
Message-ID: <1479176033-36604-2-git-send-email-liq3ea@gmail.com> (raw)
In-Reply-To: <1479176033-36604-1-git-send-email-liq3ea@gmail.com>

Currently, the backend of VirtFS doesn't have a cleanup
function. This will lead resource leak issues if the backed
driver allocates resources. This patch addresses this issue.

Signed-off-by: Li Qiang <liq3ea@gmail.com>
---

Changes since the v1:
-move the cleanup stuff above calls to g_free
-add cleanup call in the error path of realize if init was called

 fsdev/file-op-9p.h | 1 +
 hw/9pfs/9p.c       | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h
index 6db9fea..a56dc84 100644
--- a/fsdev/file-op-9p.h
+++ b/fsdev/file-op-9p.h
@@ -100,6 +100,7 @@ struct FileOperations
 {
     int (*parse_opts)(QemuOpts *, struct FsDriverEntry *);
     int (*init)(struct FsContext *);
+    void (*cleanup)(struct FsContext *);
     int (*lstat)(FsContext *, V9fsPath *, struct stat *);
     ssize_t (*readlink)(FsContext *, V9fsPath *, char *, size_t);
     int (*chmod)(FsContext *, V9fsPath *, FsCred *);
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index f7e14ac..70361a2 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -3521,6 +3521,9 @@ int v9fs_device_realize_common(V9fsState *s, Error **errp)
     rc = 0;
 out:
     if (rc) {
+        if (s->ops->cleanup && s->ctx.private) {
+            s->ops->cleanup(&s->ctx);
+        }
         g_free(s->ctx.fs_root);
         g_free(s->tag);
         v9fs_path_free(&path);
@@ -3530,6 +3533,9 @@ out:
 
 void v9fs_device_unrealize_common(V9fsState *s, Error **errp)
 {
+    if (s->ops->cleanup) {
+        s->ops->cleanup(&s->ctx);
+    }
     g_free(s->tag);
     g_free(s->ctx.fs_root);
 }
-- 
1.8.3.1

  reply	other threads:[~2016-11-15  2:14 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-15  2:13 [Qemu-devel] [PATCH v2 0/3] 9pfs: add cleanup operation in handle/proxy backend Li Qiang
2016-11-15  2:13 ` Li Qiang [this message]
2016-11-15  2:13 ` [Qemu-devel] [PATCH v2 2/3] 9pfs: add cleanup operation for handle backend driver Li Qiang
2016-11-15 10:22   ` Greg Kurz
2016-11-15  2:13 ` [Qemu-devel] [PATCH v2 3/3] 9pfs: add cleanup operation for proxy " Li Qiang
2016-11-15 10:26   ` Greg Kurz
2016-11-15 10:16 ` [Qemu-devel] [PATCH v2 0/3] 9pfs: add cleanup operation in handle/proxy backend Greg Kurz
2016-11-15 10:21   ` Li Qiang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1479176033-36604-2-git-send-email-liq3ea@gmail.com \
    --to=liq3ea@gmail.com \
    --cc=groug@kaod.org \
    --cc=liqiang6-s@360.cn \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.