From: Vincent Hanquez <vincent.hanquez@eu.citrix.com>
Date: Tue, 18 Aug 2009 15:59:03 +0000 (+0100)
Subject: state which tasks requires threading and which one doesn't.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ac3c74b839d3d50b077c894534e49a4177232f07;p=xenclient%2Ftoolstack.git

state which tasks requires threading and which one doesn't.
---

diff --git a/xenvm/tasks.ml b/xenvm/tasks.ml
index 7a84146..35e8f4c 100644
--- a/xenvm/tasks.ml
+++ b/xenvm/tasks.ml
@@ -69,8 +69,10 @@ type task_descr = {
 	args: (string * argreq * argty) list; (* name, required, type *)
 }
 
-let mk_desc name = { name = name; description = ""; need_threading = false; args = [] }
-let mk_desc_args name args = { name = name; description = ""; need_threading = false; args = args }
+let mk_desc ?(t=true) name = { name = name; description = ""; need_threading = t; args = [] }
+let mk_desc_nb name = { name = name; description = ""; need_threading = false; args = [] }
+let mk_desc_args ?(t=true) name args = { name = name; description = ""; need_threading = t; args = args }
+let mk_desc_args_nb name args = { name = name; description = ""; need_threading = false; args = args }
 
 let actions_table = [
 	(Quit,       mk_desc "quit");
@@ -83,15 +85,15 @@ let actions_table = [
 	(Suspend,    mk_desc_args "suspend" [ ("live", D (ValBool false), ArgBool);
 	                                      ("file", R, ArgString); ] );
 	(Restore,    mk_desc_args "restore" [ "file", R, ArgString ] );
-	(GetDomid,   mk_desc "get-domid");
-	(GetStatus,  mk_desc "get-status");
-	(GetVNC,     mk_desc "get-vnc");
+	(GetDomid,   mk_desc_nb "get-domid");
+	(GetStatus,  mk_desc_nb "get-status");
+	(GetVNC,     mk_desc_nb "get-vnc");
 	(Trigger,    mk_desc_args "trigger" [ "params", R, ArgString ]);
 	(Device,     mk_desc_args "device" [ "type", R, ArgString;
 	                                     "cmd", R, ArgString;
 	                                     "extra", O, ArgListString; ]);
-	(Get,        mk_desc_args "get" [ "field", R, ArgString; ]);
-	(Set,        mk_desc_args "set" [ "field", R, ArgString; "value", R, ArgString ]);
+	(Get,        mk_desc_args_nb "get" [ "field", R, ArgString; ]);
+	(Set,        mk_desc_args_nb "set" [ "field", R, ArgString; "value", R, ArgString ]);
 	(AddDisk,    mk_desc_args "disk-add" [ "path", R, ArgString; "device", R, ArgString;
 	                                       "type", R, ArgString; "mode", R, ArgString;
 	                                       "devtype", R, ArgString ]);
@@ -102,11 +104,11 @@ let actions_table = [
 	(DelDisk,    mk_desc "disk-del");
 	(DelNic,     mk_desc "nic-del");
 	(DelPCI,     mk_desc "pci-del");
-	(ListDisk,   mk_desc "disk-list");
-	(ListNic,    mk_desc "nic-list");
-	(ListPCI,    mk_desc "pci-list");
-	(ReadConfig, mk_desc_args "read-config" [ "path", O, ArgString ]);
-	(Help,       mk_desc "help");
+	(ListDisk,   mk_desc_nb "disk-list");
+	(ListNic,    mk_desc_nb "nic-list");
+	(ListPCI,    mk_desc_nb "pci-list");
+	(ReadConfig, mk_desc_args_nb "read-config" [ "path", O, ArgString ]);
+	(Help,       mk_desc_nb "help");
 	(*
 	(Checkpoint, ("checkpoint", Some VmRunning));
 	*)