From 816bd1fb22633c32f5a744411d640ab97a00809d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 1 Jan 1970 00:00:00 +0000 Subject: [PATCH] Don't duplicate unnecessary call to D.get_info. --- mlvirsh/mlvirsh.ml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/mlvirsh/mlvirsh.ml b/mlvirsh/mlvirsh.ml index acb6a51..8037e4d 100644 --- a/mlvirsh/mlvirsh.ml +++ b/mlvirsh/mlvirsh.ml @@ -304,7 +304,7 @@ let do_command = in let print_domain_list doms = List.iter ( - fun dom -> + 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 @@ -579,14 +579,21 @@ let do_command = cmd0 print_domain_list (fun () -> let c = get_readonly_connection () in - D.get_domains c [D.ListActive]), + 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 + D.get_domains_and_infos c [D.ListAll]), s_"List the running domains.", []; "list-defined", cmd0 print_domain_list (fun () -> let c = get_readonly_connection () in - D.get_domains c [D.ListInactive]), + D.get_domains_and_infos c [D.ListInactive]), s_"List the defined but not running domains.", []; "quit", -- 1.8.3.1