From: Li Qiang <liq3ea@gmail.com>
Date: Wed, 23 Nov 2016 12:53:34 +0000 (+0100)
Subject: 9pfs: adjust the order of resource cleanup in device unrealize
X-Git-Tag: v2.8.0-rc2~11^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4774718e5c194026ba5ee7a28d9be49be3080e42;p=thirdparty%2Fqemu.git

9pfs: adjust the order of resource cleanup in device unrealize

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 <liq3ea@gmail.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Signed-off-by: Greg Kurz <groug@kaod.org>
---

diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index aea7e9d3920..087b5c98eec 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 {