X-Git-Url: http://git.annexia.org/?p=virt-top.git;a=blobdiff_plain;f=virt-df%2Fvirt_df_main.ml;h=65d1f2fc76afb401ee3b00394744de0abc2110ab;hp=e6ae53e42e439551ffe0f9e35ce871334899ab16;hb=0bdb08c61ec66a16a81c2778a2a76cac77b08fda;hpb=c0e4c9e257316408d4097b5d75a85617d97c6c35

diff --git a/virt-df/virt_df_main.ml b/virt-df/virt_df_main.ml
index e6ae53e..65d1f2f 100644
--- a/virt-df/virt_df_main.ml
+++ b/virt-df/virt_df_main.ml
@@ -54,6 +54,8 @@ let () =
       "uri " ^ s_ "Connect to URI (default: Xen)";
     "--connect", Arg.String set_uri,
       "uri " ^ s_ "Connect to URI (default: Xen)";
+    "--debug", Arg.Set debug,
+      " " ^ s_ "Debug mode (default: false)";
     "-h", Arg.Set human,
       " " ^ s_ "Print sizes in human-readable format";
     "--human-readable", Arg.Set human,
@@ -63,7 +65,7 @@ let () =
     "--inodes", Arg.Set inodes,
       " " ^ s_ "Show inodes instead of blocks";
     "-t", Arg.String test_mode,
-      "dev" ^ s_ "(Test mode) Display contents of block device or file";
+      "dev " ^ s_ "(Test mode) Display contents of block device or file";
     "--version", Arg.Unit version,
       " " ^ s_ "Display version and exit";
   ] in
@@ -362,8 +364,7 @@ OPTIONS" in
       let lvs = group_by lvs in
 
       let lvs =
-	List.map (fun (pv, devs) -> list_lvs pv.lvm_plugin_id devs)
-	  lvs in
+	List.map (fun (pv, devs) -> list_lvs pv.lvm_plugin_id devs) lvs in
       let lvs = List.concat lvs in
 
       (* lvs is a list of potential LV devices.  Now run them through the
@@ -371,7 +372,10 @@ OPTIONS" in
        *)
       let filesystems =
 	List.filter_map (
-	  fun { lv_dev = dev } -> probe_for_filesystem dev
+	  fun ({ lv_dev = dev } as lv) ->
+	    match probe_for_filesystem dev with
+	    | Some fs -> Some (lv, fs)
+	    | None -> None
 	) lvs in
 
       { dom with dom_lv_filesystems = filesystems }
@@ -401,45 +405,48 @@ OPTIONS" in
 
   (* HOF to iterate over filesystems. *)
   let iter_over_filesystems doms
-      (f : domain -> ?disk:disk -> ?part:(partition * int) -> filesystem ->
+      (f : domain -> ?disk:disk -> ?partno:int -> device -> filesystem ->
 	unit) =
     List.iter (
       fun ({ dom_disks = disks; dom_lv_filesystems = filesystems } as dom) ->
 	(* Ordinary filesystems found on disks & partitions. *)
 	List.iter (
 	  function
-	  | ({ d_content = `Filesystem fs } as disk) ->
-	      f dom ~disk fs
+	  | ({ d_content = `Filesystem fs; d_dev = dev } as disk) ->
+	      f dom ~disk dev fs
 	  | ({ d_content = `Partitions partitions } as disk) ->
 	      List.iteri (
 		fun i ->
 		  function
-		  | ({ part_content = `Filesystem fs } as part) ->
-		      f dom ~disk ~part:(part, i) fs
+		  | { part_content = `Filesystem fs; part_dev = dev } ->
+		      f dom ~disk ~partno:(i+1) dev fs
 		  | _ -> ()
 	      ) partitions.parts
 	  | _ -> ()
 	) disks;
 	(* LV filesystems. *)
-	List.iter (fun fs -> f dom fs) filesystems
+	List.iter (fun ({lv_dev = dev}, fs) -> f dom dev fs) filesystems
     ) doms
   in
 
   (* Print stats for each recognized filesystem. *)
-  let print_stats dom ?disk ?part fs =
+  let print_stats dom ?disk ?partno dev fs =
     (* Printable name is like "domain:hda" or "domain:hda1". *)
     let name =
       let dom_name = dom.dom_name in
+      (* Get the disk name (eg. "hda") from the domain XML, if
+       * we have it, otherwise use the device name (eg. for LVM).
+       *)
       let disk_name =
 	match disk with
-	| None -> "???" (* XXX keep LV dev around *)
+	| None -> dev#name
 	| Some disk -> disk.d_target
       in
-      match part with
+      match partno with
       | None ->
 	  dom_name ^ ":" ^ disk_name
-      | Some (_, pnum) ->
-	  dom_name ^ ":" ^ disk_name ^ string_of_int pnum in
+      | Some partno ->
+	  dom_name ^ ":" ^ disk_name ^ string_of_int partno in
     printf "%-20s " name;
 
     if fs.fs_is_swap then (