54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
From: Li Qiang <liq3ea@gmail.com>
|
|
Date: Wed, 23 Nov 2016 13:53:34 +0100
|
|
Subject: [PATCH] 9pfs: add cleanup operation in FileOperations
|
|
|
|
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>
|
|
Reviewed-by: Greg Kurz <groug@kaod.org>
|
|
Signed-off-by: Greg Kurz <groug@kaod.org>
|
|
(cherry picked from commit 702dbcc274e2ca43be20ba64c758c0ca57dab91d)
|
|
---
|
|
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 6db9feac8f..a56dc8488d 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 1b7dd8437c..641a348234 100644
|
|
--- a/hw/9pfs/9p.c
|
|
+++ b/hw/9pfs/9p.c
|
|
@@ -3492,6 +3492,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->tag);
|
|
g_free(s->ctx.fs_root);
|
|
v9fs_path_free(&path);
|
|
@@ -3501,6 +3504,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);
|
|
}
|