git.annexia.org
/
ocaml-libvirt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't duplicate unnecessary call to D.get_info.
[ocaml-libvirt.git]
/
mlvirsh
/
mlvirsh.ml
diff --git
a/mlvirsh/mlvirsh.ml
b/mlvirsh/mlvirsh.ml
index
4c77e7f
..
8037e4d
100644
(file)
--- a/
mlvirsh/mlvirsh.ml
+++ b/
mlvirsh/mlvirsh.ml
@@
-302,9
+302,9
@@
let do_command =
| D.VcpuRunning -> s_"running"
| D.VcpuBlocked -> s_"blocked"
in
| 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
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
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
string_of_domain_state state
with Libvirt.Virterror _ -> "" in
printf "%5s %-30s %s\n" id name state
@@
-576,21
+576,24
@@
let do_command =
s_"Print the hostname.",
[];
"list",
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
(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",
s_"List the running domains.",
[];
"list-defined",
- cmd0 print_domain_
array
+ cmd0 print_domain_
list
(fun () ->
let c = get_readonly_connection () in
(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",
s_"List the defined but not running domains.",
[];
"quit",