From patchwork Thu Nov 17 03:16:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Qiang X-Patchwork-Id: 9433453 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 34DEB60476 for ; Thu, 17 Nov 2016 03:18:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2714229203 for ; Thu, 17 Nov 2016 03:18:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1BF1D2923E; Thu, 17 Nov 2016 03:18:04 +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 BBEAD29203 for ; Thu, 17 Nov 2016 03:18:03 +0000 (UTC) Received: from localhost ([::1]:56370 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c7DD9-0005Ke-0C for patchwork-qemu-devel@patchwork.kernel.org; Wed, 16 Nov 2016 22:18:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c7DCZ-0005JA-4L for qemu-devel@nongnu.org; Wed, 16 Nov 2016 22:17:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c7DCW-0004tS-06 for qemu-devel@nongnu.org; Wed, 16 Nov 2016 22:17:27 -0500 Received: from mail-it0-x242.google.com ([2607:f8b0:4001:c0b::242]:32831) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c7DCV-0004t8-Ov for qemu-devel@nongnu.org; Wed, 16 Nov 2016 22:17:23 -0500 Received: by mail-it0-x242.google.com with SMTP id c20so11953546itb.0 for ; Wed, 16 Nov 2016 19:17:23 -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=bGnpJ0CrcRnkDtKgYvyRqyjHWa2CkqK532wbBtWQuQg=; b=1HVNh75dE1Zw9wQS9cikh0/lxv0/7fmrtvScMLM6uVoXLbqRmlOvce8H8oBFO6I9pG i3h0dkZ0AwzumGbnD+EmH6Oh/yWBvuMWJy+8MNZsoZ5PGo6Me3Pco//WgSvyRTR/bd1O zaPOlcb9fIiayXccp1FLHGGqskVDNWivn7MyLGy/PDj26Dgvy8ixA67R/CikAtwBFC8H xsKdlPH+jTHW6pR+kYkcM9bncCknHsnTcip9JomohTn45mJ+grCBalgoVQhnbOV5MroG g2c7jSjNISEu8Ed5N0Vn2xB74k10IVtemPs0t/Ywm0zy8QV6h9wAf0qyx37PEIRhOTjB 52Ew== 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=bGnpJ0CrcRnkDtKgYvyRqyjHWa2CkqK532wbBtWQuQg=; b=F+GG9zetvvprSuCpAgZALngNWRRro1Hts9r5zeR2dxO8e3QDDHhYXBBLRmiIYUh8CU HnjC+BKZm3lGmLKAyUZ96w+Mi9xuWgTu/V9WPu6P9G4tJfLxawgSQ+t1djXjNwGeA2Et Hr7hJZ42wCoGTLMK3u5f8fBnHFNSfOflgtd1ADtcAnWzbi4OjlDa/SIz3540Ai6QVn7l /8jIRTx0UzZOrvoy6S3ExRYaOpG3pCe91DDmXYnMQEsBDMFqOIJxPYlg8rpMe3Xmo+JT 9fvPHKAP5Xf+5xIyzP5+f9HnO4AVUr5rKmzkuXnwRGnGoMn/4u7K+3QS15IgOJBAbR9w QQQw== X-Gm-Message-State: AKaTC00ofN1IQnPcEjslkqfgs4V6Hqiy5KlnaE/bHf5M2mQyifUV2AomUDkiWKaJvI27/g== X-Received: by 10.107.35.11 with SMTP id j11mr1221032ioj.68.1479352642364; Wed, 16 Nov 2016 19:17:22 -0800 (PST) Received: from localhost.localdomain ([104.192.110.250]) by smtp.gmail.com with ESMTPSA id l3sm4424577iti.3.2016.11.16.19.17.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Nov 2016 19:17:21 -0800 (PST) From: Li Qiang To: groug@kaod.org, qemu-devel@nongnu.org Date: Wed, 16 Nov 2016 22:16:54 -0500 Message-Id: <1479352616-64991-3-git-send-email-liq3ea@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1479352616-64991-1-git-send-email-liq3ea@gmail.com> References: <1479352616-64991-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::242 Subject: [Qemu-devel] [PATCH v3 2/4] 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 087b5c9..faebd91 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->tag); g_free(s->ctx.fs_root); 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); }