OSDN Git Service

9pfs: adjust the order of resource cleanup in device unrealize
authorLi Qiang <liq3ea@gmail.com>
Wed, 23 Nov 2016 12:53:34 +0000 (13:53 +0100)
committerGreg Kurz <groug@kaod.org>
Wed, 23 Nov 2016 12:53:34 +0000 (13:53 +0100)
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>
hw/9pfs/9p.c

index aea7e9d..087b5c9 100644 (file)
@@ -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 {