X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=mlvirsh%2Fmlvirsh.ml;h=8037e4d739ca411fa90669af00cdeeaa9ffefebb;hb=816bd1fb22633c32f5a744411d640ab97a00809d;hp=6bf695a96f87d94b7c227dc5669eb3d2a89cc73b;hpb=b549cb36134996b0c9264611ed2d3c84605c7ec1;p=ocaml-libvirt.git

diff --git a/mlvirsh/mlvirsh.ml b/mlvirsh/mlvirsh.ml
index 6bf695a..8037e4d 100644
--- a/mlvirsh/mlvirsh.ml
+++ b/mlvirsh/mlvirsh.ml
@@ -302,9 +302,9 @@ let do_command =
     | D.VcpuRunning -> s_"running"
     | D.VcpuBlocked -> s_"blocked"
   in
-  let print_domain_array doms =
-    Array.iter (
-      fun dom ->
+  let print_domain_list doms =
+    List.iter (
+      fun (dom, info) ->
 	let id =
 	  try sprintf "%d" (D.get_id dom)
 	  with Libvirt.Virterror _ -> "" in
@@ -313,7 +313,7 @@ let do_command =
 	  with Libvirt.Virterror _ -> "" in
 	let state =
 	  try
-	    let { D.state = state } = D.get_info dom in
+	    let { D.state = state } = info in
 	    string_of_domain_state state
 	  with Libvirt.Virterror _ -> "" in
 	printf "%5s %-30s %s\n" id name state
@@ -454,7 +454,17 @@ let do_command =
       cmd4 print_string
 	(fun dom path offset size ->
 	   let buf = String.create size in
-	   D.block_peek dom path offset size buf 0;
+	   let max_peek = D.max_peek dom in
+	   let rec loop i =
+	     let remaining = size-i in
+	     if remaining > 0 then (
+	       let size = min remaining max_peek in
+	       D.block_peek dom path
+		 (Int64.add offset (Int64.of_int i)) size buf i;
+	       loop (i+size)
+	     )
+	   in
+	   loop 0;
 	   buf)
 	(arg_readonly_connection domain_of_string)
 	string_of_string Int64.of_string int_of_string,
@@ -494,7 +504,17 @@ let do_command =
       cmd3 print_string
 	(fun dom offset size ->
 	   let buf = String.create size in
-	   D.memory_peek dom [D.Virtual] offset size buf 0;
+	   let max_peek = D.max_peek dom in
+	   let rec loop i =
+	     let remaining = size-i in
+	     if remaining > 0 then (
+	       let size = min remaining max_peek in
+	       D.memory_peek dom [D.Virtual]
+		 (Int64.add offset (Int64.of_int i)) size buf i;
+	       loop (i+size)
+	     )
+	   in
+	   loop 0;
 	   buf)
 	(arg_readonly_connection domain_of_string)
 	Int64.of_string int_of_string,
@@ -556,21 +576,24 @@ let do_command =
       s_"Print the hostname.",
       [];
     "list",
-      cmd0 print_domain_array
+      cmd0 print_domain_list
+	(fun () ->
+	   let c = get_readonly_connection () in
+	   D.get_domains_and_infos c [D.ListActive]),
+      s_"List the running domains.",
+      [];
+    "list-all",
+      cmd0 print_domain_list
 	(fun () ->
 	   let c = get_readonly_connection () in
-	   let n = C.num_of_domains c in
-	   let domids = C.list_domains c n in
-	   Array.map (D.lookup_by_id c) domids),
+	   D.get_domains_and_infos c [D.ListAll]),
       s_"List the running domains.",
       [];
     "list-defined",
-      cmd0 print_domain_array
+      cmd0 print_domain_list
 	(fun () ->
 	   let c = get_readonly_connection () in
-	   let n = C.num_of_defined_domains c in
-	   let domnames = C.list_defined_domains c n in
-	   Array.map (D.lookup_by_name c) domnames),
+	   D.get_domains_and_infos c [D.ListInactive]),
       s_"List the defined but not running domains.",
       [];
     "quit",