X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=lib%2Fdiskimage_linux_swap.ml;h=22b8d5eaf7adc87503784fda91ad2ca66338f1f3;hb=5318d6037135dbb8f53074d8003af769132d72bd;hp=8f15651b373d0ad8e868d62d40c66bddd5add83c;hpb=3844c0e3ba0eb0e07b7ecabe7794def7dd622c2b;p=virt-df.git

diff --git a/lib/diskimage_linux_swap.ml b/lib/diskimage_linux_swap.ml
index 8f15651..22b8d5e 100644
--- a/lib/diskimage_linux_swap.ml
+++ b/lib/diskimage_linux_swap.ml
@@ -20,34 +20,58 @@
    Support for Linux swap partitions.
 *)
 
-open Diskimage_utils
+open Diskimage_impl
 
-let plugin_id = "linux_swap"
+open Int63.Operators
 
-let probe dev =
+let id = "linux_swap"
+let blocksize = ~^4096			(* XXX *)
+
+let rec probe dev =
   (* Load the "superblock" (ie. first 0x1000 bytes). *)
-  let bits = dev#read_bitstring 0L 0x1000 in
+  let bits = dev#read_bitstring ~^0 ~^0x1000 in
 
   bitmatch bits with
   | {
-      (* Actually this isn't just padding. *)
-      padding : 8*0x1000 - 10*8 : bitstring;
-      "SWAPSPACE2" : 80 : string
+      _ : 8*0x1000 - 10*8 : bitstring;
+      ("SWAP-SPACE"|"SWAPSPACE2") : 80 : string
     } ->
-    {
-      fs_plugin_id = plugin_id;
-      fs_block_size = 4096L;		(* XXX *)
-      fs_blocks_total = dev#size /^ 4096L;
-
-      (* The remaining fields are ignored when fs_is_swap is true. *)
-      fs_is_swap = true;
-      fs_blocks_reserved = 0L;
-      fs_blocks_avail = 0L;
-      fs_blocks_used = 0L;
-      fs_inodes_total = 0L;
-      fs_inodes_reserved = 0L;
-      fs_inodes_avail = 0L;
-      fs_inodes_used = 0L;
-    }
+
+      let fs_dev = new blocksize_overlay blocksize dev in
+      {
+	fs_cb = callbacks ();
+	fs_dev = fs_dev;
+
+	fs_blocksize = blocksize;
+	fs_blocks_total = fs_dev#size /^ blocksize;
+
+	(* The remaining fields are ignored when fs_is_swap is true. *)
+	fs_is_swap = true;
+	fs_blocks_reserved = ~^0;
+	fs_blocks_avail = ~^0;
+	fs_blocks_used = ~^0;
+	fs_inodes_total = ~^0;
+	fs_inodes_reserved = ~^0;
+	fs_inodes_avail = ~^0;
+	fs_inodes_used = ~^0;
+      }
+
   | { _ } ->
       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 =
+  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