From 67ebe6585e7db9cfc1f01de9777f780db42868f2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 22 Mar 2022 13:39:57 +0000 Subject: [PATCH] lib: Remove Utils.metaversion This was used before we turned the helpers into OCaml modules but is now dead code, remove it. Fixes: commit 4de22686fe74e1711efd9bfed3f663b67e7ad69e Fixes: commit 724ecb5e887e5b71db836143ec0c0d8a20b05903 Fixes: commit 5609c73c615a8f12c5c6d50908bb4761bdc16173 (cherry picked from commit c208bc97d863aa43857c72608a1fc57ab50047ed) --- lib/utils.ml | 2 -- lib/utils.mli | 11 ----------- 2 files changed, 13 deletions(-) diff --git a/lib/utils.ml b/lib/utils.ml index 7b16dd8b..4f0ff67a 100644 --- a/lib/utils.ml +++ b/lib/utils.ml @@ -164,8 +164,6 @@ let rec wait_for_file filename timeout = wait_for_file filename (timeout-1) ) -let metaversion = Digest.to_hex (Digest.string Config.package_version_full) - let with_nbd_connect_unix ?(meta_contexts = []) ~socket f = let nbd = NBD.create () in protect diff --git a/lib/utils.mli b/lib/utils.mli index 76a2ec8c..3f8e4b3c 100644 --- a/lib/utils.mli +++ b/lib/utils.mli @@ -67,17 +67,6 @@ val wait_for_file : string -> int -> bool (** [wait_for_file filename timeout] waits up to [timeout] seconds for [filename] to appear. It returns [true] if the file appeared. *) -val metaversion : string -(** When writing the metadata files between versions we serialize this - string first to ensure the binary metadata blob is compatible. - - This prevents mixing and matching helpers between incompatible - versions of virt-v2v (which could cause a crash) and discourages - people from trying to write their own metadata. - - Eventually we may switch to using an "open metadata" format instead - (eg. XML). *) - val with_nbd_connect_unix : ?meta_contexts:string list -> socket:string -> (NBD.t -> 'a) -> -- 2.31.1