X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=mlvirsh%2Fmlvirsh.ml;h=9fd3779294f330ab919d847b8b8aa4fab0354d52;hb=4d988dada41d62c5f40a24c69220184ff6b079e0;hp=4c77e7f34dc77cab723602f684df6cb6b2d94915;hpb=78840c01a52b57d64a97586434aa5fe963218154;p=ocaml-libvirt.git

diff --git a/mlvirsh/mlvirsh.ml b/mlvirsh/mlvirsh.ml
index 4c77e7f..9fd3779 100644
--- a/mlvirsh/mlvirsh.ml
+++ b/mlvirsh/mlvirsh.ml
@@ -302,8 +302,8 @@ let do_command =
     | D.VcpuRunning -> s_"running"
     | D.VcpuBlocked -> s_"blocked"
   in
-  let print_domain_array doms =
-    Array.iter (
+  let print_domain_list doms =
+    List.iter (
       fun dom ->
 	let id =
 	  try sprintf "%d" (D.get_id dom)
@@ -576,21 +576,17 @@ let do_command =
       s_"Print the hostname.",
       [];
     "list",
-      cmd0 print_domain_array
+      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),
+	   fst (Libvirt.get_domains c ~want_info:false [D.ListActive])),
       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),
+	   fst (Libvirt.get_domains c ~want_info:false [D.ListInactive])),
       s_"List the defined but not running domains.",
       [];
     "quit",