X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=lib%2Fdiskimage_linux_swsuspend.ml;h=f6b3a21d1b329d802f0c48fa3ae488b97acec78a;hb=5318d6037135dbb8f53074d8003af769132d72bd;hp=4fec7b36059fdff716d66bcf7f66af90ae276295;hpb=71536ae75dceb08e0f3c3403033fb2eb25a08883;p=virt-df.git diff --git a/lib/diskimage_linux_swsuspend.ml b/lib/diskimage_linux_swsuspend.ml index 4fec7b3..f6b3a21 100644 --- a/lib/diskimage_linux_swsuspend.ml +++ b/lib/diskimage_linux_swsuspend.ml @@ -33,14 +33,13 @@ let rec probe dev = bitmatch bits with | { - (* Actually this isn't just padding. *) - padding : 8*0x1000 - 10*8 : bitstring; + _ : 8*0x1000 - 10*8 : bitstring; ("S1SUSPEND"|"S2SUSPEND") : 80 : string } -> let fs_dev = new blocksize_overlay blocksize dev in { - fs_cb = callbacks; + fs_cb = callbacks (); fs_dev = fs_dev; fs_blocksize = blocksize; @@ -65,11 +64,14 @@ let rec probe dev = *) and offset_is_free _ _ = false -and callbacks = { - fs_cb_name = id; - fs_cb_printable_name = "Linux s/w suspend"; - fs_cb_offset_is_free = offset_is_free; -} +and callbacks = + let i = ref 0 in + fun () -> { + fs_cb_uq = (incr i; !i); + fs_cb_name = id; + fs_cb_printable_name = "Linux s/w suspend"; + fs_cb_offset_is_free = offset_is_free; + } (* Register the plugin. *) let () = register_plugin ~filesystem:probe id