Reorganize the code so disk parsing is in a separate library.

[virt-df.git] / lib / diskimage_lvm2.ml

diff --git a/virt-df/virt_df_lvm2.ml b/lib/diskimage_lvm2.ml
similarity index 97%
rename from virt-df/virt_df_lvm2.ml
rename to lib/diskimage_lvm2.ml
index 4976497..f8ce5ec 100644 (file)
--- a/virt-df/virt_df_lvm2.ml
+++ b/lib/diskimage_lvm2.ml
@@ -23,10 +23,8 @@
 open Printf
 open ExtList
 
-open Virt_df_gettext.Gettext
-open Virt_df
-
-open Virt_df_lvm2_metadata
+open Diskimage_utils
+open Diskimage_lvm2_metadata
 
 let plugin_name = "LVM2"
 
@@ -188,7 +186,7 @@ let rec list_lvs devs =
   (* Parse the metadata using the external lexer/parser. *)
   let pvs = List.map (
     fun (uuid, (metadata, dev)) ->
-      uuid, (Virt_df_lvm2_lexer.parse_lvm2_metadata_from_string metadata,
+      uuid, (Diskimage_lvm2_lexer.parse_lvm2_metadata_from_string metadata,
             dev)
   ) pvs in
 
@@ -430,8 +428,3 @@ let rec list_lvs devs =
 
   (* Return the list of LV devices. *)
   lvs
-
-(*----------------------------------------------------------------------*)
-(* Register with main code. *)
-let () =
-  lvm_type_register plugin_name probe_pv list_lvs