From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c6TGE-0004pM-C7 for qemu-devel@nongnu.org; Mon, 14 Nov 2016 21:14:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c6TGD-0006f7-J6 for qemu-devel@nongnu.org; Mon, 14 Nov 2016 21:14:10 -0500 Received: from mail-it0-x244.google.com ([2607:f8b0:4001:c0b::244]:36172) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c6TGD-0006eT-EJ for qemu-devel@nongnu.org; Mon, 14 Nov 2016 21:14:09 -0500 Received: by mail-it0-x244.google.com with SMTP id n68so18657098itn.3 for ; Mon, 14 Nov 2016 18:14:09 -0800 (PST) From: Li Qiang Date: Mon, 14 Nov 2016 21:13:51 -0500 Message-Id: <1479176033-36604-2-git-send-email-liq3ea@gmail.com> In-Reply-To: <1479176033-36604-1-git-send-email-liq3ea@gmail.com> References: <1479176033-36604-1-git-send-email-liq3ea@gmail.com> Subject: [Qemu-devel] [PATCH v2 1/3] 9pfs: add cleanup operation in FileOperations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: groug@kaod.org, qemu-devel@nongnu.org Cc: liqiang6-s@360.cn, Li Qiang 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 --- 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