mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

9pfs: add cleanup operation in FileOperations

Browse Source 
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>
This commit is contained in:
Li Qiang 2016-11-23 13:53:34 +01:00 committed by Greg Kurz
parent 4774718e5c
commit 702dbcc274
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fsdev/file-op-9p.h
View File

@ -100,6 +100,7 @@ struct FileOperations
{ {
int (*parse_opts)(QemuOpts *, struct FsDriverEntry *); int (*parse_opts)(QemuOpts *, struct FsDriverEntry *);
int (*init)(struct FsContext *); int (*init)(struct FsContext *);
void (*cleanup)(struct FsContext *);
int (*lstat)(FsContext *, V9fsPath *, struct stat *); int (*lstat)(FsContext *, V9fsPath *, struct stat *);
ssize_t (*readlink)(FsContext *, V9fsPath *, char *, size_t); ssize_t (*readlink)(FsContext *, V9fsPath *, char *, size_t);
int (*chmod)(FsContext *, V9fsPath *, FsCred *); int (*chmod)(FsContext *, V9fsPath *, FsCred *);

6
hw/9pfs/9p.c
View File

@ -3521,6 +3521,9 @@ int v9fs_device_realize_common(V9fsState *s, Error **errp)
rc = 0; rc = 0;
out: out:
if (rc) { if (rc) {
if (s->ops->cleanup && s->ctx.private) {
s->ops->cleanup(&s->ctx);
}
g_free(s->tag); g_free(s->tag);
g_free(s->ctx.fs_root); g_free(s->ctx.fs_root);
v9fs_path_free(&path); v9fs_path_free(&path);
@ -3530,6 +3533,9 @@ out:
void v9fs_device_unrealize_common(V9fsState *s, Error **errp) 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->tag);
g_free(s->ctx.fs_root); g_free(s->ctx.fs_root);
} }