From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37422) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c9at0-0005Oy-5H for qemu-devel@nongnu.org; Wed, 23 Nov 2016 11:59:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c9asx-0005Xs-1y for qemu-devel@nongnu.org; Wed, 23 Nov 2016 11:59:06 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:34453) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c9asw-0005Wt-Np for qemu-devel@nongnu.org; Wed, 23 Nov 2016 11:59:02 -0500 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id uANGwde7097643 for ; Wed, 23 Nov 2016 11:59:01 -0500 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 26watfr5y0-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 23 Nov 2016 11:59:01 -0500 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 23 Nov 2016 16:58:59 -0000 From: Greg Kurz Date: Wed, 23 Nov 2016 17:58:15 +0100 In-Reply-To: <1479920298-24983-1-git-send-email-groug@kaod.org> References: <1479920298-24983-1-git-send-email-groug@kaod.org> Message-Id: <1479920298-24983-2-git-send-email-groug@kaod.org> Subject: [Qemu-devel] [for-2.8 1/4] 9pfs: adjust the order of resource cleanup in device unrealize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Aneesh Kumar K.V" , Greg Kurz , Li Qiang From: Li Qiang Unrealize should undo things that were set during realize in reverse order. So should do in the error path in realize. Signed-off-by: Li Qiang Reviewed-by: Greg Kurz Signed-off-by: Greg Kurz --- hw/9pfs/9p.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index aea7e9d39206..087b5c98eec1 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -3521,8 +3521,8 @@ int v9fs_device_realize_common(V9fsState *s, Error **errp) rc = 0; out: if (rc) { - g_free(s->ctx.fs_root); g_free(s->tag); + g_free(s->ctx.fs_root); v9fs_path_free(&path); } return rc; @@ -3530,8 +3530,8 @@ out: void v9fs_device_unrealize_common(V9fsState *s, Error **errp) { - g_free(s->ctx.fs_root); g_free(s->tag); + g_free(s->ctx.fs_root); } typedef struct VirtfsCoResetData { -- 2.7.4