From patchwork Mon Nov 14 12:32:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Qiang X-Patchwork-Id: 9427423 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 9118C60476 for ; Mon, 14 Nov 2016 12:35:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88F9C286BB for ; Mon, 14 Nov 2016 12:35:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D7C42878F; Mon, 14 Nov 2016 12:35:06 +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 28418286BB for ; Mon, 14 Nov 2016 12:35:06 +0000 (UTC) Received: from localhost ([::1]:39522 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c6GTZ-0007Gx-Av for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Nov 2016 07:35:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c6GSq-0007De-B6 for qemu-devel@nongnu.org; Mon, 14 Nov 2016 07:34:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c6GSn-0003d0-8A for qemu-devel@nongnu.org; Mon, 14 Nov 2016 07:34:20 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:33187) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c6GSn-0003cp-2Q for qemu-devel@nongnu.org; Mon, 14 Nov 2016 07:34:17 -0500 Received: by mail-pg0-f65.google.com with SMTP id 3so8915502pgd.0 for ; Mon, 14 Nov 2016 04:34:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:from:to:cc:subject:date:in-reply-to:references; bh=vDER1W2Iejbpt+Rg5oe+6CtYo93+rYQjqUSEZqd/bxQ=; b=AWbrn5Y7QIonYMyypdMy+69OVSc0IVPd8cl/RoVl1iCNKKE7woDQRgcBAa7rNcLdFm YpD+hPa52xlxZXDCeIFnhreU+Ohxa0bmiqueL3BWOCyBeEtJu/vRw3r7iKY+GeVcYrpk cwDAfz1pHL0uopn8f7QHcHFuE7zqkts1Pvtle+rbsrb1gjfUmNbl+9iRuKUyCY+ZSY5A TqIKOQh5t+k88BUNzOAhy0wsq+cwxtIp6qGhnbHPqNArRWqTXVMGro2c/egwSdMwfQZ4 lVLevGknbH3K4+rbyr2+h3htNdZiy36eN5Ii0UJAWy5f6g4OUfssgmj3J53JDNilM4IK F/AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:from:to:cc:subject:date:in-reply-to :references; bh=vDER1W2Iejbpt+Rg5oe+6CtYo93+rYQjqUSEZqd/bxQ=; b=dfbBIttuizKt7x6FTHBA/w/FowQjcVpCK0y9U3L8kw8y5x+AovmuOmCUK1KPrHQ5qJ W20vrS9HZELTqJoaaEzip7gpv9V043F1rYSKlqaaCD7N8QNX+iNHM7oVHy4P+arXjK+D htIGgzTBEFKIlTwQb4xD3jH2CRU6it3BST3Xoq3vkzHBhMZzo0bPLTbjDq+O95lsSu0M Ob8GL9SUP/LEHOLYNYJJSD0uMZ9rCswjJ/Ihu3a7fwW2kuLAsc6i7Y4MKfaSslRXlNnS GeLoAvHzpkVIRce9EaIRnVBQ9ohVrTvPwk8CV/czRpfLY8kFM+ASjrbluSCvz/vN7Jlf +7AA== X-Gm-Message-State: ABUngvf5ZPYfYazxHLw88frwWDSquT2BbgKEbK8uwq+odar6XAZMNcL/OdixCgr00+UWDA== X-Received: by 10.98.44.212 with SMTP id s203mr35742827pfs.84.1479126796032; Mon, 14 Nov 2016 04:33:16 -0800 (PST) Received: from localhost.localdomain ([104.192.110.250]) by smtp.gmail.com with ESMTPSA id xg4sm35177845pac.39.2016.11.14.04.33.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Nov 2016 04:33:15 -0800 (PST) Message-ID: <5829af0b.84f4420a.a436f.4a6d@mx.google.com> X-Google-Original-Message-ID: <1479126778-125867-2-git-send-email-Qiang(liqiang6-s@360.cn)> From: Li Qiang X-Google-Original-From: Li Qiang(liqiang6-s@360.cn) To: groug@kaod.org, qemu-devel@nongnu.org Date: Mon, 14 Nov 2016 07:32:56 -0500 X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1479126778-125867-1-git-send-email-Qiang(liqiang6-s@360.cn)> References: <1479126778-125867-1-git-send-email-Qiang(liqiang6-s@360.cn)> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.83.65 Subject: [Qemu-devel] [PATCH 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 From: 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 --- fsdev/file-op-9p.h | 1 + hw/9pfs/9p.c | 3 +++ 2 files changed, 4 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 aea7e9d..166b5a7 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -3532,6 +3532,9 @@ void v9fs_device_unrealize_common(V9fsState *s, Error **errp) { g_free(s->ctx.fs_root); g_free(s->tag); + if (s->ops->cleanup) { + s->ops->cleanup(&s->ctx); + } } typedef struct VirtfsCoResetData {