[Libguestfs] [PATCH] mllib: Bind %identity C primitive to Common_utils.identity.

--- mllib/common_utils.ml | 2 ++ mllib/common_utils.mli | 2 ++ mllib/xpath_helpers.ml | 2 -- v2v/input_vmx.ml | 2 -- v2v/v2v_unit_tests.ml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mllib/common_utils.ml b/mllib/common_utils.ml index 63d8dd92e..6a9b08973 100644 --- a/mllib/common_utils.ml +++ b/mllib/common_utils.ml @@ -282,6 +282,8 @@ let ( /^ ) = Int64.div let ( &^ ) = Int64.logand let ( ~^ ) = Int64.lognot +external identity : 'a -> 'a = "%identity" + let roundup64 i a = let a = a -^ 1L in (i +^ a) &^ (~^ a) let div_roundup64 i a = (i +^ a -^ 1L) /^ a diff --git a/mllib/common_utils.mli b/mllib/common_utils.mli index ec41a8ff8..0669a42bf 100644 --- a/mllib/common_utils.mli +++ b/mllib/common_utils.mli @@ -142,6 +142,8 @@ val ( &^ ) : int64 -> int64 -> int64 val ( ~^ ) : int64 -> int64 (** Various int64 operators. *) +external identity : 'a -> 'a = "%identity" + val roundup64 : int64 -> int64 -> int64 (** [roundup64 i a] returns [i] rounded up to the next multiple of [a]. *) val div_roundup64 : int64 -> int64 -> int64 diff --git a/mllib/xpath_helpers.ml b/mllib/xpath_helpers.ml index 8648596a4..d651fab23 100644 --- a/mllib/xpath_helpers.ml +++ b/mllib/xpath_helpers.ml @@ -36,8 +36,6 @@ let xpath_eval parsefn xpathctx expr = expr str ) -external identity : 'a -> 'a = "%identity" - let xpath_string = xpath_eval identity let xpath_int = xpath_eval int_of_string let xpath_int64 = xpath_eval Int64.of_string diff --git a/v2v/input_vmx.ml b/v2v/input_vmx.ml index b72161a82..c48a0155a 100644 --- a/v2v/input_vmx.ml +++ b/v2v/input_vmx.ml @@ -26,8 +26,6 @@ open Types open Utils open Name_from_disk -external identity : 'a -> 'a = "%identity" - let rec find_disks vmx vmx_filename = find_scsi_disks vmx vmx_filename @ find_ide_disks vmx vmx_filename diff --git a/v2v/v2v_unit_tests.ml b/v2v/v2v_unit_tests.ml index 51284a9aa..7f98e09d3 100644 --- a/v2v/v2v_unit_tests.ml +++ b/v2v/v2v_unit_tests.ml @@ -23,7 +23,7 @@ open Types open Printf -external identity : 'a -> 'a = "%identity" +open Common_utils let inspect_defaults = { i_type = ""; i_distro = ""; i_arch = ""; -- 2.12.0