X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=lib%2Fdiskimage.ml;h=30a7a39102c2ce7a91a34f2058b5e9c270c13fa7;hb=3844c0e3ba0eb0e07b7ecabe7794def7dd622c2b;hp=fbbec4b7d3ebf3a7d2808749ce362335cc7320eb;hpb=9611aba66734efe3e2f1e0792a90003b657a89f5;p=virt-df.git

diff --git a/lib/diskimage.ml b/lib/diskimage.ml
index fbbec4b..30a7a39 100644
--- a/lib/diskimage.ml
+++ b/lib/diskimage.ml
@@ -24,24 +24,38 @@ open Unix
 include Diskimage_utils
 
 let partition_types = [
-  "MBR", Diskimage_mbr.probe_mbr;
+  Diskimage_mbr.plugin_id,
+    ("MBR", Diskimage_mbr.probe);
 ]
 
 let filesystem_types = [
-  "ext2", Diskimage_ext2.probe_ext2;
-  "linux_swap", Diskimage_linux_swap.probe_swap;
+  Diskimage_ext2.plugin_id,
+    ("Linux ext2/3", Diskimage_ext2.probe);
+  Diskimage_linux_swap.plugin_id,
+    ("Linux swap", Diskimage_linux_swap.probe);
 ]
 
 let lvm_types = [
-  "LVM", (Diskimage_lvm2.probe_pv, Diskimage_lvm2.list_lvs);
+  Diskimage_lvm2.plugin_id,
+    ("Linux LVM2", Diskimage_lvm2.probe, Diskimage_lvm2.list);
 ]
 
+let name_of_parts id =
+  let name, _ = List.assoc id partition_types in
+  name
+let name_of_filesystem id =
+  let name, _ = List.assoc id filesystem_types in
+  name
+let name_of_lvm id =
+  let name, _, _ = List.assoc id lvm_types in
+  name
+
 (* Probe a device for partitions.  Returns [Some parts] or [None]. *)
 let probe_for_partitions dev =
   if !debug then eprintf "probing for partitions on %s ...\n%!" dev#name;
   let rec loop = function
     | [] -> None
-    | (parts_name, probe_fn) :: rest ->
+    | (parts_plugin_id, (_, probe_fn)) :: rest ->
 	try Some (probe_fn dev)
 	with Not_found -> loop rest
   in
@@ -49,10 +63,9 @@ let probe_for_partitions dev =
   if !debug then (
     match r with
     | None -> eprintf "no partitions found on %s\n%!" dev#name
-    | Some { parts_name = name; parts = parts } ->
-	eprintf "found %d %s partitions on %s:\n"
-	  (List.length parts) name dev#name;
-	List.iter (fun p -> eprintf "\t%s\n%!" (string_of_partition p)) parts
+    | Some { parts_plugin_id = name; parts = parts } ->
+	eprintf "found %d %s partitions on %s\n"
+	  (List.length parts) name dev#name
   );
   r
 
@@ -61,7 +74,7 @@ let probe_for_filesystem dev =
   if !debug then eprintf "probing for a filesystem on %s ...\n%!" dev#name;
   let rec loop = function
     | [] -> None
-    | (fs_name, probe_fn) :: rest ->
+    | (fs_name, (_, probe_fn)) :: rest ->
 	try Some (probe_fn dev)
 	with Not_found -> loop rest
   in
@@ -71,7 +84,7 @@ let probe_for_filesystem dev =
     | None -> eprintf "no filesystem found on %s\n%!" dev#name
     | Some fs ->
 	eprintf "found a filesystem on %s:\n" dev#name;
-	eprintf "\t%s\n%!" (string_of_filesystem fs)
+	eprintf "\t%s\n%!" fs.fs_plugin_id
   );
   r
 
@@ -80,7 +93,7 @@ let probe_for_pv dev =
   if !debug then eprintf "probing if %s is a PV ...\n%!" dev#name;
   let rec loop = function
     | [] -> None
-    | (lvm_name, (probe_fn, _)) :: rest ->
+    | (lvm_name, (_, probe_fn, _)) :: rest ->
 	try Some (probe_fn lvm_name dev)
 	with Not_found -> loop rest
   in
@@ -94,7 +107,7 @@ let probe_for_pv dev =
   r
 
 let list_lvs lvm_name devs =
-  let _, list_lvs_fn = List.assoc lvm_name lvm_types in
+  let _, _, list_lvs_fn = List.assoc lvm_name lvm_types in
   list_lvs_fn devs
 
 (* Create machine description. *)