From mboxrd@z Thu Jan  1 00:00:00 1970
From: Yang Hongyang <yanghy@cn.fujitsu.com>
Subject: [PATCH 4/6]xl: Add 'xl tmem-thaw' command
Date: Wed, 19 May 2010 16:32:29 +0800
Message-ID: <4BF3A21D.6000407@cn.fujitsu.com>
References: <4BF39FB9.3050005@cn.fujitsu.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <4BF39FB9.3050005@cn.fujitsu.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>
Cc: Dan Magenheimer <dan.magenheimer@oracle.com>, Keir Fraser <keir.fraser@eu.citrix.com>, Stefano Stabellini <stefano.stabellini@eu.citrix.com>
List-Id: xen-devel@lists.xenproject.org

Add 'xl tmem-thaw' command

Signed-off-by: Yang Hongyang<yanghy@cn.fujitsu.com> 

diff -r 6997a436e0ed tools/libxl/libxl.c
--- a/tools/libxl/libxl.c	Wed May 19 23:33:08 2010 +0800
+++ b/tools/libxl/libxl.c	Wed May 19 23:35:06 2010 +0800
@@ -2870,3 +2870,18 @@
 
     return rc;
 }
+
+int libxl_tmem_thaw(struct libxl_ctx *ctx, uint32_t domid)
+{
+    int rc;
+
+    rc = xc_tmem_control(ctx->xch, -1, TMEMC_THAW, domid, 0, 0,
+                         0, NULL);
+    if (rc < 0) {
+        XL_LOG_ERRNOVAL(ctx, XL_LOG_ERROR, rc,
+            "Can not thaw tmem pools");
+        return -1;
+    }
+
+    return rc;
+}
diff -r 6997a436e0ed tools/libxl/libxl.h
--- a/tools/libxl/libxl.h	Wed May 19 23:33:08 2010 +0800
+++ b/tools/libxl/libxl.h	Wed May 19 23:35:06 2010 +0800
@@ -516,5 +516,6 @@
 char *libxl_tmem_list(struct libxl_ctx *ctx, uint32_t domid, int use_long);
 int libxl_tmem_freeze(struct libxl_ctx *ctx, uint32_t domid);
 int libxl_tmem_destroy(struct libxl_ctx *ctx, uint32_t domid);
+int libxl_tmem_thaw(struct libxl_ctx *ctx, uint32_t domid);
 #endif /* LIBXL_H */
 
diff -r 6997a436e0ed tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c	Wed May 19 23:33:08 2010 +0800
+++ b/tools/libxl/xl_cmdimpl.c	Wed May 19 23:35:06 2010 +0800
@@ -3786,3 +3786,39 @@
     exit(0);
 }
 
+int main_tmem_thaw(int argc, char **argv)
+{
+    char *dom = NULL;
+    int all = 0;
+    int opt;
+
+    while ((opt = getopt(argc, argv, "ah")) != -1) {
+        switch (opt) {
+        case 'a':
+            all = 1;
+            break;
+        case 'h':
+            help("tmem-thaw");
+            exit(0);
+        default:
+            fprintf(stderr, "option `%c' not supported.\n", opt);
+            break;
+        }
+    }
+
+    dom = argv[optind];
+    if (!dom && all == 0) {
+        fprintf(stderr, "You must specify -a or a domain id.\n\n");
+        help("tmem-thaw");
+        exit(1);
+    }
+
+    if (all)
+        domid = -1;
+    else
+        find_domain(dom);
+
+    libxl_tmem_thaw(&ctx, domid);
+    exit(0);
+}
+
diff -r 6997a436e0ed tools/libxl/xl_cmdimpl.h
--- a/tools/libxl/xl_cmdimpl.h	Wed May 19 23:33:08 2010 +0800
+++ b/tools/libxl/xl_cmdimpl.h	Wed May 19 23:35:06 2010 +0800
@@ -55,6 +55,7 @@
 int main_tmem_list(int argc, char **argv);
 int main_tmem_freeze(int argc, char **argv);
 int main_tmem_destroy(int argc, char **argv);
+int main_tmem_thaw(int argc, char **argv);
 
 void help(char *command);
 
diff -r 6997a436e0ed tools/libxl/xl_cmdtable.c
--- a/tools/libxl/xl_cmdtable.c	Wed May 19 23:33:08 2010 +0800
+++ b/tools/libxl/xl_cmdtable.c	Wed May 19 23:35:06 2010 +0800
@@ -242,6 +242,12 @@
       "[<Domain>|-a]",
       "  -a                             Destroy all tmem",
     },
+    { "tmem-thaw",
+      &main_tmem_thaw,
+      "Thaw tmem pools",
+      "[<Domain>|-a]",
+      "  -a                             Thaw all tmem",
+    },
 };
 
 int cmdtable_len = sizeof(cmd_table)/sizeof(struct cmd_spec);

-- 
Regards
Yang Hongyang