X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=lib%2Fdiskimage_linux_swap.ml;h=22b8d5eaf7adc87503784fda91ad2ca66338f1f3;hb=f29ccfd0f06ecbcda1ecbb7f7d7290714b6a80bc;hp=4933980ed469621c0dae43d94278d61be715c734;hpb=8ecbebaf01f96a781ded3e24235697c62bc515b4;p=virt-df.git

diff --git a/lib/diskimage_linux_swap.ml b/lib/diskimage_linux_swap.ml
index 4933980..22b8d5e 100644
--- a/lib/diskimage_linux_swap.ml
+++ b/lib/diskimage_linux_swap.ml
@@ -20,27 +20,26 @@
    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
 
   bitmatch bits with
   | {
-      (* Actually this isn't just padding. *)
-      padding : 8*0x1000 - 10*8 : bitstring;
+      _ : 8*0x1000 - 10*8 : bitstring;
       ("SWAP-SPACE"|"SWAPSPACE2") : 80 : string
     } ->
 
       let fs_dev = new blocksize_overlay blocksize dev in
       {
-	fs_plugin_id = plugin_id;
+	fs_cb = callbacks ();
 	fs_dev = fs_dev;
 
 	fs_blocksize = blocksize;
@@ -63,9 +62,16 @@ let probe dev =
 (* Linux swap space is always 'free', apart from the superblock.
  * Compare diskimage_linux_swsuspend.ml
  *)
-let offset_is_free _ offset = offset >= blocksize
-
-let callbacks = {
-  fs_cb_probe = probe;
-  fs_cb_offset_is_free = offset_is_free;
-}
+and offset_is_free _ offset = offset >= blocksize
+
+and callbacks =
+  let i = ref 0 in
+  fun () -> {
+    fs_cb_uq = (incr i; !i);
+    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