Restructure library plug-ins again.

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

diff --git a/lib/diskimage_linux_swap.ml b/lib/diskimage_linux_swap.ml
index b8c49e6..a3c1b23 100644 (file)
--- a/lib/diskimage_linux_swap.ml
+++ b/lib/diskimage_linux_swap.ml
@@ -20,14 +20,14 @@
    Support for Linux swap partitions.
 *)
 
-open Diskimage_utils
+open Diskimage_impl
 
 open Int63.Operators
 
-let plugin_id = "linux_swap"
+let id = "linux_swap"
 let blocksize = ~^4096                 (* XXX *)
 
-let probe dev =
+let rec probe dev =
   (* Load the "superblock" (ie. first 0x1000 bytes). *)
   let bits = dev#read_bitstring ~^0 ~^0x1000 in
 
@@ -40,7 +40,7 @@ let probe dev =
 
       let fs_dev = new blocksize_overlay blocksize dev in
       {
-       fs_plugin_id = plugin_id;
+       fs_cb = callbacks;
        fs_dev = fs_dev;
 
        fs_blocksize = blocksize;
@@ -59,3 +59,17 @@ let probe dev =
 
   | { _ } ->
       raise Not_found                  (* Not Linux swapspace. *)
+
+(* Linux swap space is always 'free', apart from the superblock.
+ * Compare diskimage_linux_swsuspend.ml
+ *)
+and offset_is_free _ offset = offset >= blocksize
+
+and callbacks = {
+  fs_cb_name = id;
+  fs_cb_printable_name = "Linux swap";
+  fs_cb_offset_is_free = offset_is_free;
+}
+
+(* Register the plugin. *)
+let () = register_plugin ~filesystem:probe id