From patchwork Tue Nov 15 02:13:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Qiang X-Patchwork-Id: 9428799 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C88B26047D for ; Tue, 15 Nov 2016 02:14:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 979C028B40 for ; Tue, 15 Nov 2016 02:14:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C99628B43; Tue, 15 Nov 2016 02:14:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0A67328B40 for ; Tue, 15 Nov 2016 02:14:41 +0000 (UTC) Received: from localhost ([::1]:43633 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c6TGj-0004qB-5C for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Nov 2016 21:14:41 -0500 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=AIkonBkYQ6C7gbzpTdTeZNGmDHbsh3lOcWCusg+umaI=; b=bkdQw4NZhFSkHfIZL3ELHpx8tLMjG4MqYlcCU0PBGjMMfITarHYcOMS9SggueIGog1 5HE+MvfY0MsmzahckQsbxm69IDRQV0s+hHIH2ezjxl94JEL6GlXAFPOMGoBIliv6sdAw FGxplWgTwIqbJEDdP0GRPRptMz4z6UbXbdd5q/Vy4LibvkiPBiGgZt4LRl2PUJ2zYXl3 IugJGVDvKTCC36UUPTVxZtlnXmK5U5CFOI+aOBvawDRl2ewAuL60dXoQyX0j3+WVx5qs 3zA5M9V2upUXg6J7L4Bnx8yN304sfYMy3Y2njpQX1BMIc9fDptyzr3NL1xawiTHOJrXa 555w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=AIkonBkYQ6C7gbzpTdTeZNGmDHbsh3lOcWCusg+umaI=; b=mD+q9k9UKii09VDtpQQIlDd5Zpw4vNXVftgQ0erpvkV1fz/Vxf231PXVYkzVp0vPbr P4ZrbsnwTSzrQGG1WMfiQ82DQx+PAvzM4dDq5cee3nW3o669TQKdeycAAyjK83CjrORA BYJdk4LYncad3Y4X4PKC/PIv2uf7MKc8Vgr/M/l+0mVuvdX2n6VRYSHzylGdSLxYDd7R GKX7HKa7P3vAHtzNWoam5z0XzJzfz4qQAsCIVmCUeVoBr29tk3RjPFUBYSTXGbHRV0h7 ZXMvieXJsb15ZzDxgt+snOWW7xAoOSAJFBMVeCsL8GxoE2Wx20hcXd52Z0O1VNzwV/JQ q9eA== X-Gm-Message-State: ABUngvdswxZndqM3s5knZHyo8sdfWGE7Nks/OYeqFSIX+jn8K3r3WoPNDXRELEyACZP+5Q== X-Received: by 10.107.131.195 with SMTP id n64mr33807884ioi.161.1479176048819; Mon, 14 Nov 2016 18:14:08 -0800 (PST) Received: from localhost.localdomain ([104.192.110.250]) by smtp.gmail.com with ESMTPSA id x99sm10496707ioi.17.2016.11.14.18.14.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Nov 2016 18:14:08 -0800 (PST) From: Li Qiang To: groug@kaod.org, qemu-devel@nongnu.org Date: Mon, 14 Nov 2016 21:13:51 -0500 Message-Id: <1479176033-36604-2-git-send-email-liq3ea@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1479176033-36604-1-git-send-email-liq3ea@gmail.com> References: <1479176033-36604-1-git-send-email-liq3ea@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4001:c0b::244 Subject: [Qemu-devel] [PATCH v2 1/3] 9pfs: add cleanup operation in FileOperations X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Li Qiang , liqiang6-s@360.cn Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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); }