[Libguestfs] [PATCH 5/5] common/mltools: Rename Common_utils to Tools_utils.
Richard W.M. Jones
rjones at redhat.com
Tue Sep 26 12:16:15 UTC 2017
Reflecting the purpose of this module now, which is to act as a place
for utility functions shared only by the OCaml virt tools.
---
.gitignore | 4 +--
builder/builder.ml | 2 +-
builder/cache.ml | 2 +-
builder/cmdline.ml | 2 +-
builder/downloader.ml | 2 +-
builder/index.ml | 2 +-
builder/index_parser.ml | 2 +-
builder/ini_reader.ml | 2 +-
builder/languages.ml | 2 +-
builder/list_entries.ml | 2 +-
builder/paths.ml | 2 +-
builder/sigchecker.ml | 2 +-
builder/simplestreams_parser.ml | 2 +-
builder/sources.ml | 2 +-
builder/utils.ml | 2 +-
builder/yajl.ml | 2 +-
common/mltools/Makefile.am | 38 +++++++++++-----------
common/mltools/checksums.ml | 2 +-
common/mltools/curl.ml | 2 +-
common/mltools/getopt_tests.ml | 2 +-
common/mltools/regedit.ml | 2 +-
common/mltools/registry.ml | 2 +-
common/mltools/test-getopt.sh | 4 +--
.../mltools/{common_utils-c.c => tools_utils-c.c} | 0
common/mltools/{common_utils.ml => tools_utils.ml} | 0
.../mltools/{common_utils.mli => tools_utils.mli} | 0
...{common_utils_tests.ml => tools_utils_tests.ml} | 14 ++++----
common/mltools/xpath_helpers.ml | 2 +-
customize/SELinux_relabel.ml | 2 +-
customize/append_line.ml | 2 +-
customize/customize_main.ml | 2 +-
customize/customize_run.ml | 2 +-
customize/firstboot.ml | 2 +-
customize/hostname.ml | 2 +-
customize/password.ml | 2 +-
customize/perl_edit.ml | 2 +-
customize/ssh_key.ml | 2 +-
customize/subscription_manager.ml | 2 +-
customize/timezone.ml | 2 +-
dib/cmdline.ml | 2 +-
dib/dib.ml | 2 +-
dib/elements.ml | 2 +-
dib/output_format.ml | 2 +-
dib/output_format_docker.ml | 2 +-
dib/output_format_qcow2.ml | 2 +-
dib/output_format_squashfs.ml | 2 +-
dib/output_format_tar.ml | 2 +-
dib/output_format_tgz.ml | 2 +-
dib/output_format_vhd.ml | 2 +-
dib/utils.ml | 2 +-
docs/C_SOURCE_FILES | 2 +-
generator/customize.ml | 2 +-
get-kernel/get_kernel.ml | 2 +-
po/POTFILES | 8 ++---
po/POTFILES-ml | 26 +++++++--------
resize/resize.ml | 2 +-
sparsify/cmdline.ml | 2 +-
sparsify/copying.ml | 2 +-
sparsify/in_place.ml | 2 +-
sparsify/sparsify.ml | 2 +-
sysprep/main.ml | 2 +-
sysprep/sysprep_operation.ml | 2 +-
sysprep/sysprep_operation_backup_files.ml | 2 +-
sysprep/sysprep_operation_cron_spool.ml | 2 +-
sysprep/sysprep_operation_fs_uuids.ml | 4 +--
sysprep/sysprep_operation_net_hostname.ml | 2 +-
sysprep/sysprep_operation_net_hwaddr.ml | 2 +-
sysprep/sysprep_operation_package_manager_cache.ml | 2 +-
sysprep/sysprep_operation_script.ml | 2 +-
sysprep/sysprep_operation_user_account.ml | 2 +-
v2v/DOM.ml | 2 +-
v2v/changeuid.ml | 2 +-
v2v/cmdline.ml | 2 +-
v2v/convert_linux.ml | 2 +-
v2v/convert_windows.ml | 2 +-
v2v/copy_to_local.ml | 2 +-
v2v/create_libvirt_xml.ml | 2 +-
v2v/create_ovf.ml | 2 +-
v2v/input_disk.ml | 2 +-
v2v/input_libvirt.ml | 2 +-
v2v/input_libvirt_other.ml | 2 +-
v2v/input_libvirt_vcenter_https.ml | 2 +-
v2v/input_libvirt_vddk.ml | 2 +-
v2v/input_libvirt_xen_ssh.ml | 2 +-
v2v/input_libvirtxml.ml | 2 +-
v2v/input_ova.ml | 2 +-
v2v/input_vmx.ml | 2 +-
v2v/inspect_source.ml | 2 +-
v2v/linux.ml | 2 +-
v2v/linux_bootloaders.ml | 2 +-
v2v/linux_kernels.ml | 2 +-
v2v/name_from_disk.ml | 2 +-
v2v/output_glance.ml | 2 +-
v2v/output_libvirt.ml | 2 +-
v2v/output_local.ml | 2 +-
v2v/output_null.ml | 2 +-
v2v/output_qemu.ml | 2 +-
v2v/output_rhv.ml | 2 +-
v2v/output_vdsm.ml | 2 +-
v2v/parse_libvirt_xml.ml | 2 +-
v2v/parse_ovf_from_ova.ml | 2 +-
v2v/parse_vmx.ml | 2 +-
v2v/target_bus_assignment.ml | 2 +-
v2v/test-harness/v2v_test_harness.ml | 2 +-
v2v/types.ml | 2 +-
v2v/utils.ml | 2 +-
v2v/v2v.ml | 2 +-
v2v/v2v_unit_tests.ml | 2 +-
v2v/vCenter.ml | 2 +-
v2v/windows.ml | 2 +-
v2v/windows_virtio.ml | 2 +-
111 files changed, 149 insertions(+), 151 deletions(-)
diff --git a/.gitignore b/.gitignore
index 0932f9ea6..36a193054 100644
--- a/.gitignore
+++ b/.gitignore
@@ -135,9 +135,9 @@ Makefile.in
/common/mlstdutils/oUnit-*
/common/mlstdutils/std_utils_tests
/common/mltools/.depend
-/common/mltools/common_utils_tests
/common/mltools/getopt_tests
/common/mltools/JSON_tests
+/common/mltools/tools_utils_tests
/common/mltools/oUnit-*
/common/mlutils/.depend
/common/mlutils/c_utils_unit_tests
@@ -295,8 +295,6 @@ Makefile.in
/fuse/test-guestmount-fd
/fuse/test-guestunmount-fd
/generator/.depend
-/generator/common_utils.ml
-/generator/common_utils.mli
/generator/files-generated.txt
/generator/generator
/generator/.pod2text.data*
diff --git a/builder/builder.ml b/builder/builder.ml
index 3c1f04c77..97a9f0d37 100644
--- a/builder/builder.ml
+++ b/builder/builder.ml
@@ -21,7 +21,7 @@ open Common_gettext.Gettext
module G = Guestfs
open Std_utils
-open Common_utils
+open Tools_utils
open Unix_utils
open Password
open Planner
diff --git a/builder/cache.ml b/builder/cache.ml
index 494796edb..dbd222fda 100644
--- a/builder/cache.ml
+++ b/builder/cache.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Utils
diff --git a/builder/cmdline.ml b/builder/cmdline.ml
index a1f901144..8cbd4ca68 100644
--- a/builder/cmdline.ml
+++ b/builder/cmdline.ml
@@ -19,7 +19,7 @@
(* Command line argument parsing. *)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Getopt.OptionName
diff --git a/builder/downloader.ml b/builder/downloader.ml
index d6b27c8c7..3e776fdc2 100644
--- a/builder/downloader.ml
+++ b/builder/downloader.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Utils
diff --git a/builder/index.ml b/builder/index.ml
index 54af6e719..b5f51163f 100644
--- a/builder/index.ml
+++ b/builder/index.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Utils
diff --git a/builder/index_parser.ml b/builder/index_parser.ml
index fb546831f..66e921ec4 100644
--- a/builder/index_parser.ml
+++ b/builder/index_parser.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Utils
diff --git a/builder/ini_reader.ml b/builder/ini_reader.ml
index 2d8ff7e59..3e1bfdfae 100644
--- a/builder/ini_reader.ml
+++ b/builder/ini_reader.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
type sections = section list
and section = string * fields (* [name] + fields *)
diff --git a/builder/languages.ml b/builder/languages.ml
index 155322014..e97b1e3da 100644
--- a/builder/languages.ml
+++ b/builder/languages.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
let re_locale =
PCRE.compile ~caseless:true "^([a-z]+)(_([a-z]+))?(\\.([a-z0-9-]+))?(@([a-z]+))?$"
diff --git a/builder/list_entries.ml b/builder/list_entries.ml
index ea607107c..c0aae1675 100644
--- a/builder/list_entries.ml
+++ b/builder/list_entries.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Printf
diff --git a/builder/paths.ml b/builder/paths.ml
index e0fb9a024..b8ce57191 100644
--- a/builder/paths.ml
+++ b/builder/paths.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
let xdg_cache_home =
try Some (Sys.getenv "XDG_CACHE_HOME" // "virt-builder")
diff --git a/builder/sigchecker.ml b/builder/sigchecker.ml
index 55e743940..d7fba405b 100644
--- a/builder/sigchecker.ml
+++ b/builder/sigchecker.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Unix_utils
open Common_gettext.Gettext
diff --git a/builder/simplestreams_parser.ml b/builder/simplestreams_parser.ml
index c550675ba..7f1a4e726 100644
--- a/builder/simplestreams_parser.ml
+++ b/builder/simplestreams_parser.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Yajl
diff --git a/builder/sources.ml b/builder/sources.ml
index 48687bb26..93609bef6 100644
--- a/builder/sources.ml
+++ b/builder/sources.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Printf
diff --git a/builder/utils.ml b/builder/utils.ml
index 26f158d6f..acb6c2f4b 100644
--- a/builder/utils.ml
+++ b/builder/utils.ml
@@ -20,7 +20,7 @@
open Printf
-open Common_utils
+open Tools_utils
type gpgkey_type =
| No_Key
diff --git a/builder/yajl.ml b/builder/yajl.ml
index 5ae1c5d9b..a555baa22 100644
--- a/builder/yajl.ml
+++ b/builder/yajl.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
type yajl_val =
diff --git a/common/mltools/Makefile.am b/common/mltools/Makefile.am
index b00e126a1..921d1f00a 100644
--- a/common/mltools/Makefile.am
+++ b/common/mltools/Makefile.am
@@ -21,26 +21,26 @@ EXTRA_DIST = \
$(SOURCES_MLI) \
$(SOURCES_ML) \
$(SOURCES_C) \
- common_utils_tests.ml \
getopt_tests.ml \
JSON_tests.ml \
- test-getopt.sh
+ test-getopt.sh \
+ tools_utils_tests.ml
SOURCES_MLI = \
checksums.mli \
- common_utils.mli \
curl.mli \
getopt.mli \
JSON.mli \
planner.mli \
regedit.mli \
registry.mli \
+ tools_utils.mli \
URI.mli \
xpath_helpers.mli
SOURCES_ML = \
getopt.ml \
- common_utils.ml \
+ tools_utils.ml \
URI.ml \
planner.ml \
registry.ml \
@@ -54,8 +54,8 @@ SOURCES_C = \
../options/decrypt.c \
../options/keys.c \
../options/uri.c \
- common_utils-c.c \
getopt-c.c \
+ tools_utils-c.c \
uri-c.c
if HAVE_OCAML
@@ -145,14 +145,14 @@ $(MLTOOLS_CMA): $(OBJECTS) libmltools.a
# Tests.
-common_utils_tests_SOURCES = dummy.c
-common_utils_tests_CPPFLAGS = \
+tools_utils_tests_SOURCES = dummy.c
+tools_utils_tests_CPPFLAGS = \
-I. \
-I$(top_builddir) \
-I$(shell $(OCAMLC) -where) \
-I$(top_srcdir)/lib
-common_utils_tests_BOBJECTS = common_utils_tests.cmo
-common_utils_tests_XOBJECTS = $(common_utils_tests_BOBJECTS:.cmo=.cmx)
+tools_utils_tests_BOBJECTS = tools_utils_tests.cmo
+tools_utils_tests_XOBJECTS = $(tools_utils_tests_BOBJECTS:.cmo=.cmx)
getopt_tests_SOURCES = dummy.c
getopt_tests_CPPFLAGS = \
@@ -169,8 +169,8 @@ JSON_tests_XOBJECTS = $(JSON_tests_BOBJECTS:.cmo=.cmx)
# Can't call the following as <test>_OBJECTS because automake gets confused.
if !HAVE_OCAMLOPT
-common_utils_tests_THEOBJECTS = $(common_utils_tests_BOBJECTS)
-common_utils_tests.cmo: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS)
+tools_utils_tests_THEOBJECTS = $(tools_utils_tests_BOBJECTS)
+tools_utils_tests.cmo: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS)
getopt_tests_THEOBJECTS = $(getopt_tests_BOBJECTS)
getopt_tests.cmo: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS)
@@ -178,8 +178,8 @@ getopt_tests.cmo: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS)
JSON_tests_THEOBJECTS = $(JSON_tests_BOBJECTS)
JSON_tests.cmo: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS)
else
-common_utils_tests_THEOBJECTS = $(common_utils_tests_XOBJECTS)
-common_utils_tests.cmx: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS)
+tools_utils_tests_THEOBJECTS = $(tools_utils_tests_XOBJECTS)
+tools_utils_tests.cmx: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS)
getopt_tests_THEOBJECTS = $(getopt_tests_XOBJECTS)
getopt_tests.cmx: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS)
@@ -196,18 +196,18 @@ OCAMLLINKFLAGS = \
mlguestfs.$(MLARCHIVE) \
$(LINK_CUSTOM_OCAMLC_ONLY)
-common_utils_tests_DEPENDENCIES = \
- $(common_utils_tests_THEOBJECTS) \
+tools_utils_tests_DEPENDENCIES = \
+ $(tools_utils_tests_THEOBJECTS) \
../mlstdutils/mlstdutils.$(MLARCHIVE) \
../mlgettext/mlgettext.$(MLARCHIVE) \
../mlpcre/mlpcre.$(MLARCHIVE) \
$(MLTOOLS_CMA) \
$(top_srcdir)/ocaml-link.sh
-common_utils_tests_LINK = \
+tools_utils_tests_LINK = \
$(top_srcdir)/ocaml-link.sh -cclib '-lutils $(LIBXML2_LIBS) -lgnu' -- \
$(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \
$(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \
- $(common_utils_tests_THEOBJECTS) -o $@
+ $(tools_utils_tests_THEOBJECTS) -o $@
getopt_tests_DEPENDENCIES = \
$(getopt_tests_THEOBJECTS) \
@@ -243,8 +243,8 @@ check_PROGRAMS = \
getopt_tests
if HAVE_OCAML_PKG_OUNIT
-check_PROGRAMS += common_utils_tests JSON_tests
-TESTS += common_utils_tests JSON_tests
+check_PROGRAMS += JSON_tests tools_utils_tests
+TESTS += JSON_tests tools_utils_tests
endif
check-valgrind:
diff --git a/common/mltools/checksums.ml b/common/mltools/checksums.ml
index f4c414f57..a40edca76 100644
--- a/common/mltools/checksums.ml
+++ b/common/mltools/checksums.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Printf
diff --git a/common/mltools/curl.ml b/common/mltools/curl.ml
index ccf98acef..85fe1a8b2 100644
--- a/common/mltools/curl.ml
+++ b/common/mltools/curl.ml
@@ -19,7 +19,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
type t = {
curl : string;
diff --git a/common/mltools/getopt_tests.ml b/common/mltools/getopt_tests.ml
index 22e4282fa..1314d3bca 100644
--- a/common/mltools/getopt_tests.ml
+++ b/common/mltools/getopt_tests.ml
@@ -23,7 +23,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Getopt.OptionName
let adds = ref []
diff --git a/common/mltools/regedit.ml b/common/mltools/regedit.ml
index e07700bb1..81c82d467 100644
--- a/common/mltools/regedit.ml
+++ b/common/mltools/regedit.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
type regedits = regedit list
diff --git a/common/mltools/registry.ml b/common/mltools/registry.ml
index 7738ecc64..7ed7eb6b8 100644
--- a/common/mltools/registry.ml
+++ b/common/mltools/registry.ml
@@ -19,7 +19,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
type node = int64
diff --git a/common/mltools/test-getopt.sh b/common/mltools/test-getopt.sh
index 002bd10f6..f5aa71b89 100755
--- a/common/mltools/test-getopt.sh
+++ b/common/mltools/test-getopt.sh
@@ -1,6 +1,6 @@
#!/bin/bash -
# libguestfs
-# Copyright (C) 2016 Red Hat Inc.
+# Copyright (C) 2016-2017 Red Hat Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@ expect_fail ()
# Program works.
$t
-# Flags added automatically by Common_utils.
+# Flags added automatically by Tools_utils.
$t | grep '^trace = false'
$t | grep '^verbose = false'
diff --git a/common/mltools/common_utils-c.c b/common/mltools/tools_utils-c.c
similarity index 100%
rename from common/mltools/common_utils-c.c
rename to common/mltools/tools_utils-c.c
diff --git a/common/mltools/common_utils.ml b/common/mltools/tools_utils.ml
similarity index 100%
rename from common/mltools/common_utils.ml
rename to common/mltools/tools_utils.ml
diff --git a/common/mltools/common_utils.mli b/common/mltools/tools_utils.mli
similarity index 100%
rename from common/mltools/common_utils.mli
rename to common/mltools/tools_utils.mli
diff --git a/common/mltools/common_utils_tests.ml b/common/mltools/tools_utils_tests.ml
similarity index 96%
rename from common/mltools/common_utils_tests.ml
rename to common/mltools/tools_utils_tests.ml
index f7a4eafd1..d43a72891 100644
--- a/common/mltools/common_utils_tests.ml
+++ b/common/mltools/tools_utils_tests.ml
@@ -16,12 +16,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*)
-(* This file tests the Common_utils module. *)
+(* This file tests the Tools_utils module. *)
open OUnit2
open Std_utils
-open Common_utils
+open Tools_utils
(* Utils. *)
let assert_equal_string = assert_equal ~printer:(fun x -> x)
@@ -29,7 +29,7 @@ let assert_equal_int = assert_equal ~printer:(fun x -> string_of_int x)
let assert_equal_int64 = assert_equal ~printer:(fun x -> Int64.to_string x)
let assert_equal_intlist = assert_equal ~printer:(fun x -> "(" ^ (String.concat ";" (List.map string_of_int x)) ^ ")")
-(* Test Common_utils.parse_size and Common_utils.parse_resize. *)
+(* Test Tools_utils.parse_size and Tools_utils.parse_resize. *)
let test_parse_resize ctx =
assert_equal_int64 1_L (parse_size "1b");
assert_equal_int64 10_L (parse_size "10b");
@@ -76,7 +76,7 @@ let test_parse_resize ctx =
assert_equal_int64 101100_L (parse_resize 100000_L "+1.1%");
assert_equal_int64 101100_L (parse_resize 100000_L "+1.12%")
-(* Test Common_utils.human_size. *)
+(* Test Tools_utils.human_size. *)
let test_human_size ctx =
assert_equal_string "100" (human_size 100_L);
assert_equal_string "-100" (human_size (-100_L));
@@ -89,7 +89,7 @@ let test_human_size ctx =
assert_equal_string "3.4G" (human_size 3650722201_L);
assert_equal_string "-3.4G" (human_size (-3650722201_L))
-(* Test Common_utils.run_command. *)
+(* Test Tools_utils.run_command. *)
let test_run_command ctx =
assert_equal_int 0 (run_command ["true"]);
begin
@@ -108,7 +108,7 @@ let test_run_command ctx =
end;
()
-(* Test Common_utils.run_commands. *)
+(* Test Tools_utils.run_commands. *)
let test_run_commands ctx =
begin
let res = run_commands [] in
@@ -158,7 +158,7 @@ let test_run_commands ctx =
(* Suites declaration. *)
let suite =
- "mllib Common_utils" >:::
+ "mltools Tools_utils" >:::
[
"sizes.parse_resize" >:: test_parse_resize;
"sizes.human_size" >:: test_human_size;
diff --git a/common/mltools/xpath_helpers.ml b/common/mltools/xpath_helpers.ml
index e6185bf3d..05fad89a4 100644
--- a/common/mltools/xpath_helpers.ml
+++ b/common/mltools/xpath_helpers.ml
@@ -19,7 +19,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
(* Parse an xpath expression and return a string/int. Returns
diff --git a/customize/SELinux_relabel.ml b/customize/SELinux_relabel.ml
index ab373b33a..d404c35fa 100644
--- a/customize/SELinux_relabel.ml
+++ b/customize/SELinux_relabel.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Printf
diff --git a/customize/append_line.ml b/customize/append_line.ml
index 405080617..3371c73ac 100644
--- a/customize/append_line.ml
+++ b/customize/append_line.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
module G = Guestfs
diff --git a/customize/customize_main.ml b/customize/customize_main.ml
index 55ec3cb78..55e1b6d8e 100644
--- a/customize/customize_main.ml
+++ b/customize/customize_main.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Getopt.OptionName
diff --git a/customize/customize_run.ml b/customize/customize_run.ml
index 3dcf755eb..b42dd774d 100644
--- a/customize/customize_run.ml
+++ b/customize/customize_run.ml
@@ -20,7 +20,7 @@ open Unix
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Customize_cmdline
diff --git a/customize/firstboot.ml b/customize/firstboot.ml
index 25203cf91..5bff9159a 100644
--- a/customize/firstboot.ml
+++ b/customize/firstboot.ml
@@ -19,7 +19,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Regedit
diff --git a/customize/hostname.ml b/customize/hostname.ml
index ee2c91e6a..66fcaaacb 100644
--- a/customize/hostname.ml
+++ b/customize/hostname.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Printf
diff --git a/customize/password.ml b/customize/password.ml
index dc69b8eb7..b928e1a11 100644
--- a/customize/password.ml
+++ b/customize/password.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Printf
diff --git a/customize/perl_edit.ml b/customize/perl_edit.ml
index bb44ea062..415cae9f9 100644
--- a/customize/perl_edit.ml
+++ b/customize/perl_edit.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
external c_edit_file : verbose:bool -> Guestfs.t -> int64 -> string -> string -> unit
= "virt_customize_edit_file_perl"
diff --git a/customize/ssh_key.ml b/customize/ssh_key.ml
index da0e7d90c..518d48fe8 100644
--- a/customize/ssh_key.ml
+++ b/customize/ssh_key.ml
@@ -21,7 +21,7 @@ open Sys
open Unix
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
module G = Guestfs
diff --git a/customize/subscription_manager.ml b/customize/subscription_manager.ml
index 56ba28ab9..104602462 100644
--- a/customize/subscription_manager.ml
+++ b/customize/subscription_manager.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
type sm_credentials = {
diff --git a/customize/timezone.ml b/customize/timezone.ml
index bc40d6e3e..2ac7a1056 100644
--- a/customize/timezone.ml
+++ b/customize/timezone.ml
@@ -16,7 +16,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*)
-open Common_utils
+open Tools_utils
open Printf
diff --git a/dib/cmdline.ml b/dib/cmdline.ml
index 549f01546..9f0a70a72 100644
--- a/dib/cmdline.ml
+++ b/dib/cmdline.ml
@@ -19,7 +19,7 @@
(* Command line argument parsing. *)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Getopt.OptionName
diff --git a/dib/dib.ml b/dib/dib.ml
index e59ff94a8..5cbb10b09 100644
--- a/dib/dib.ml
+++ b/dib/dib.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Unix_utils
open Common_gettext.Gettext
diff --git a/dib/elements.ml b/dib/elements.ml
index 2d518c739..d8eb6c145 100644
--- a/dib/elements.ml
+++ b/dib/elements.ml
@@ -19,7 +19,7 @@
(* Parsing and handling of elements. *)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Utils
diff --git a/dib/output_format.ml b/dib/output_format.ml
index 6499ee259..537469ab6 100644
--- a/dib/output_format.ml
+++ b/dib/output_format.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Getopt.OptionName
diff --git a/dib/output_format_docker.ml b/dib/output_format_docker.ml
index f48da0f79..bc0f234b6 100644
--- a/dib/output_format_docker.ml
+++ b/dib/output_format_docker.ml
@@ -16,7 +16,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*)
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Getopt.OptionName
diff --git a/dib/output_format_qcow2.ml b/dib/output_format_qcow2.ml
index a32b2a4f9..5ef93f6c3 100644
--- a/dib/output_format_qcow2.ml
+++ b/dib/output_format_qcow2.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Getopt.OptionName
diff --git a/dib/output_format_squashfs.ml b/dib/output_format_squashfs.ml
index 333e711a3..d81589b09 100644
--- a/dib/output_format_squashfs.ml
+++ b/dib/output_format_squashfs.ml
@@ -16,7 +16,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*)
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Output_format
diff --git a/dib/output_format_tar.ml b/dib/output_format_tar.ml
index 132532d6c..2367d2768 100644
--- a/dib/output_format_tar.ml
+++ b/dib/output_format_tar.ml
@@ -16,7 +16,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*)
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Output_format
diff --git a/dib/output_format_tgz.ml b/dib/output_format_tgz.ml
index 155afb578..447dfe6d9 100644
--- a/dib/output_format_tgz.ml
+++ b/dib/output_format_tgz.ml
@@ -16,7 +16,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*)
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Output_format
diff --git a/dib/output_format_vhd.ml b/dib/output_format_vhd.ml
index a4bad66f9..15dd582c8 100644
--- a/dib/output_format_vhd.ml
+++ b/dib/output_format_vhd.ml
@@ -16,7 +16,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*)
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Utils
diff --git a/dib/utils.ml b/dib/utils.ml
index 8b6bb1576..856705d09 100644
--- a/dib/utils.ml
+++ b/dib/utils.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Printf
diff --git a/docs/C_SOURCE_FILES b/docs/C_SOURCE_FILES
index 6130e459f..41bb6c9eb 100644
--- a/docs/C_SOURCE_FILES
+++ b/docs/C_SOURCE_FILES
@@ -21,9 +21,9 @@ common/mlpcre/dummy.c
common/mlpcre/pcre-c.c
common/mlprogress/progress-c.c
common/mlstdutils/dummy.c
-common/mltools/common_utils-c.c
common/mltools/dummy.c
common/mltools/getopt-c.c
+common/mltools/tools_utils-c.c
common/mltools/uri-c.c
common/mlutils/c_utils-c.c
common/mlutils/dummy.c
diff --git a/generator/customize.ml b/generator/customize.ml
index 381ed0627..75984c9d5 100644
--- a/generator/customize.ml
+++ b/generator/customize.ml
@@ -624,7 +624,7 @@ and generate_customize_cmdline_ml () =
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Getopt.OptionName
diff --git a/get-kernel/get_kernel.ml b/get-kernel/get_kernel.ml
index 1c9ece44b..a15582834 100644
--- a/get-kernel/get_kernel.ml
+++ b/get-kernel/get_kernel.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Getopt.OptionName
diff --git a/po/POTFILES b/po/POTFILES
index c8a36a247..40c0708a0 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -22,6 +22,10 @@ common/mlpcre/dummy.c
common/mlpcre/pcre-c.c
common/mlprogress/progress-c.c
common/mlstdutils/dummy.c
+common/mltools/dummy.c
+common/mltools/getopt-c.c
+common/mltools/tools_utils-c.c
+common/mltools/uri-c.c
common/mlutils/c_utils-c.c
common/mlutils/dummy.c
common/mlutils/unix_utils-c.c
@@ -408,10 +412,6 @@ lib/whole-file.c
lib/yara.c
lua/lua-guestfs.c
make-fs/make-fs.c
-mllib/common_utils-c.c
-mllib/dummy.c
-mllib/getopt-c.c
-mllib/uri-c.c
ocaml/guestfs-c-actions.c
ocaml/guestfs-c-errnos.c
ocaml/guestfs-c.c
diff --git a/po/POTFILES-ml b/po/POTFILES-ml
index 23c6e50b0..dbf151ea1 100644
--- a/po/POTFILES-ml
+++ b/po/POTFILES-ml
@@ -26,6 +26,19 @@ common/mlstdutils/std_utils.ml
common/mlstdutils/std_utils_tests.ml
common/mlstdutils/stringMap.ml
common/mlstdutils/stringSet.ml
+common/mltools/JSON.ml
+common/mltools/JSON_tests.ml
+common/mltools/URI.ml
+common/mltools/checksums.ml
+common/mltools/curl.ml
+common/mltools/getopt.ml
+common/mltools/getopt_tests.ml
+common/mltools/planner.ml
+common/mltools/regedit.ml
+common/mltools/registry.ml
+common/mltools/tools_utils.ml
+common/mltools/tools_utils_tests.ml
+common/mltools/xpath_helpers.ml
common/mlutils/c_utils.ml
common/mlutils/c_utils_unit_tests.ml
common/mlutils/unix_utils.ml
@@ -60,19 +73,6 @@ dib/output_format_tgz.ml
dib/output_format_vhd.ml
dib/utils.ml
get-kernel/get_kernel.ml
-mllib/JSON.ml
-mllib/JSON_tests.ml
-mllib/URI.ml
-mllib/checksums.ml
-mllib/common_utils.ml
-mllib/common_utils_tests.ml
-mllib/curl.ml
-mllib/getopt.ml
-mllib/getopt_tests.ml
-mllib/planner.ml
-mllib/regedit.ml
-mllib/registry.ml
-mllib/xpath_helpers.ml
resize/resize.ml
sparsify/cmdline.ml
sparsify/copying.ml
diff --git a/resize/resize.ml b/resize/resize.ml
index 48c75161d..a19e57564 100644
--- a/resize/resize.ml
+++ b/resize/resize.ml
@@ -19,7 +19,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Unix_utils
open Getopt.OptionName
diff --git a/sparsify/cmdline.ml b/sparsify/cmdline.ml
index 6e0594f12..521f6733d 100644
--- a/sparsify/cmdline.ml
+++ b/sparsify/cmdline.ml
@@ -21,7 +21,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Getopt.OptionName
diff --git a/sparsify/copying.ml b/sparsify/copying.ml
index 02a53b9b4..7d004b550 100644
--- a/sparsify/copying.ml
+++ b/sparsify/copying.ml
@@ -24,7 +24,7 @@ open Unix
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Unix_utils
diff --git a/sparsify/in_place.ml b/sparsify/in_place.ml
index 1f3da2c70..de66e8c96 100644
--- a/sparsify/in_place.ml
+++ b/sparsify/in_place.ml
@@ -22,7 +22,7 @@ open Unix
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Utils
diff --git a/sparsify/sparsify.ml b/sparsify/sparsify.ml
index 60c6d468e..0f9c9036e 100644
--- a/sparsify/sparsify.ml
+++ b/sparsify/sparsify.ml
@@ -19,7 +19,7 @@
open Unix
open Printf
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Utils
diff --git a/sysprep/main.ml b/sysprep/main.ml
index ab631c479..634254d41 100644
--- a/sysprep/main.ml
+++ b/sysprep/main.ml
@@ -20,7 +20,7 @@ open Unix
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Getopt.OptionName
diff --git a/sysprep/sysprep_operation.ml b/sysprep/sysprep_operation.ml
index 17d298fc1..5c5640c67 100644
--- a/sysprep/sysprep_operation.ml
+++ b/sysprep/sysprep_operation.ml
@@ -19,7 +19,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Getopt.OptionName
diff --git a/sysprep/sysprep_operation_backup_files.ml b/sysprep/sysprep_operation_backup_files.ml
index a8b22e1b8..850cc3ad2 100644
--- a/sysprep/sysprep_operation_backup_files.ml
+++ b/sysprep/sysprep_operation_backup_files.ml
@@ -20,7 +20,7 @@ open Printf
open Std_utils
open C_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Visit
open Unix_utils.Fnmatch
diff --git a/sysprep/sysprep_operation_cron_spool.ml b/sysprep/sysprep_operation_cron_spool.ml
index f48a5201a..0f8270e04 100644
--- a/sysprep/sysprep_operation_cron_spool.ml
+++ b/sysprep/sysprep_operation_cron_spool.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Sysprep_operation
diff --git a/sysprep/sysprep_operation_fs_uuids.ml b/sysprep/sysprep_operation_fs_uuids.ml
index f125eb0d4..8e93d44ce 100644
--- a/sysprep/sysprep_operation_fs_uuids.ml
+++ b/sysprep/sysprep_operation_fs_uuids.ml
@@ -19,7 +19,7 @@
open Printf
open Common_gettext.Gettext
-open Common_utils
+open Tools_utils
open Sysprep_operation
@@ -31,7 +31,7 @@ let rec fs_uuids_perform g root side_effects =
| _, "unknown" -> ()
| dev, typ ->
if not (is_btrfs_subvolume g dev) then (
- let new_uuid = Common_utils.uuidgen () in
+ let new_uuid = uuidgen () in
try
g#set_uuid dev new_uuid
with
diff --git a/sysprep/sysprep_operation_net_hostname.ml b/sysprep/sysprep_operation_net_hostname.ml
index fe3f47412..3ffaa7c16 100644
--- a/sysprep/sysprep_operation_net_hostname.ml
+++ b/sysprep/sysprep_operation_net_hostname.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Sysprep_operation
diff --git a/sysprep/sysprep_operation_net_hwaddr.ml b/sysprep/sysprep_operation_net_hwaddr.ml
index 344eadc5b..0f0de65cb 100644
--- a/sysprep/sysprep_operation_net_hwaddr.ml
+++ b/sysprep/sysprep_operation_net_hwaddr.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Sysprep_operation
diff --git a/sysprep/sysprep_operation_package_manager_cache.ml b/sysprep/sysprep_operation_package_manager_cache.ml
index 428352d6c..109a7f213 100644
--- a/sysprep/sysprep_operation_package_manager_cache.ml
+++ b/sysprep/sysprep_operation_package_manager_cache.ml
@@ -18,7 +18,7 @@
open Sysprep_operation
open Common_gettext.Gettext
-open Common_utils
+open Tools_utils
module G = Guestfs
diff --git a/sysprep/sysprep_operation_script.ml b/sysprep/sysprep_operation_script.ml
index 62a4a2d02..fd9e62aa0 100644
--- a/sysprep/sysprep_operation_script.ml
+++ b/sysprep/sysprep_operation_script.ml
@@ -20,7 +20,7 @@ open Printf
open Unix
open Std_utils
-open Common_utils
+open Tools_utils
open Unix_utils
open Common_gettext.Gettext
open Getopt.OptionName
diff --git a/sysprep/sysprep_operation_user_account.ml b/sysprep/sysprep_operation_user_account.ml
index 3102a6267..e7d89235e 100644
--- a/sysprep/sysprep_operation_user_account.ml
+++ b/sysprep/sysprep_operation_user_account.ml
@@ -20,7 +20,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Getopt.OptionName
diff --git a/v2v/DOM.ml b/v2v/DOM.ml
index 9986fc912..3ba93b4f6 100644
--- a/v2v/DOM.ml
+++ b/v2v/DOM.ml
@@ -19,7 +19,7 @@
(* Poor man's XML DOM, mutable for ease of modification. *)
open Std_utils
-open Common_utils
+open Tools_utils
open Printf
diff --git a/v2v/changeuid.ml b/v2v/changeuid.ml
index 639fcfe12..24fd91b6e 100644
--- a/v2v/changeuid.ml
+++ b/v2v/changeuid.ml
@@ -22,7 +22,7 @@ open Unix
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Unix_utils
open Common_gettext.Gettext
diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml
index c271b8242..6d4219bd8 100644
--- a/v2v/cmdline.ml
+++ b/v2v/cmdline.ml
@@ -21,7 +21,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Getopt.OptionName
diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml
index 016b03fd6..6c1d9afff 100644
--- a/v2v/convert_linux.ml
+++ b/v2v/convert_linux.ml
@@ -24,7 +24,7 @@ open Printf
open C_utils
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Utils
diff --git a/v2v/convert_windows.ml b/v2v/convert_windows.ml
index c5bd3d9cf..38d584ba1 100644
--- a/v2v/convert_windows.ml
+++ b/v2v/convert_windows.ml
@@ -19,7 +19,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Utils
diff --git a/v2v/copy_to_local.ml b/v2v/copy_to_local.ml
index 0a2b7ed75..108eb35ab 100644
--- a/v2v/copy_to_local.ml
+++ b/v2v/copy_to_local.ml
@@ -21,7 +21,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Getopt.OptionName
diff --git a/v2v/create_libvirt_xml.ml b/v2v/create_libvirt_xml.ml
index 1551e259c..70c04cc64 100644
--- a/v2v/create_libvirt_xml.ml
+++ b/v2v/create_libvirt_xml.ml
@@ -20,7 +20,7 @@ open Printf
open Std_utils
open C_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Types
diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml
index fd7ec5fe8..01f966769 100644
--- a/v2v/create_ovf.ml
+++ b/v2v/create_ovf.ml
@@ -22,7 +22,7 @@ open Unix
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Types
diff --git a/v2v/input_disk.ml b/v2v/input_disk.ml
index a92f3a602..8c9d9eb41 100644
--- a/v2v/input_disk.ml
+++ b/v2v/input_disk.ml
@@ -19,7 +19,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Types
diff --git a/v2v/input_libvirt.ml b/v2v/input_libvirt.ml
index e8143b6ad..708feccc7 100644
--- a/v2v/input_libvirt.ml
+++ b/v2v/input_libvirt.ml
@@ -21,7 +21,7 @@
open Printf
open Common_gettext.Gettext
-open Common_utils
+open Tools_utils
open Types
open Utils
diff --git a/v2v/input_libvirt_other.ml b/v2v/input_libvirt_other.ml
index 05923e952..0bf64461a 100644
--- a/v2v/input_libvirt_other.ml
+++ b/v2v/input_libvirt_other.ml
@@ -19,7 +19,7 @@
open Printf
open Common_gettext.Gettext
-open Common_utils
+open Tools_utils
open Types
open Utils
diff --git a/v2v/input_libvirt_vcenter_https.ml b/v2v/input_libvirt_vcenter_https.ml
index 8b6856c7e..b2ff58bce 100644
--- a/v2v/input_libvirt_vcenter_https.ml
+++ b/v2v/input_libvirt_vcenter_https.ml
@@ -19,7 +19,7 @@
(** [-i libvirt] when the source is VMware vCenter *)
open Common_gettext.Gettext
-open Common_utils
+open Tools_utils
open Unix_utils.Env
open Types
diff --git a/v2v/input_libvirt_vddk.ml b/v2v/input_libvirt_vddk.ml
index b6a57d374..8fa33fbeb 100644
--- a/v2v/input_libvirt_vddk.ml
+++ b/v2v/input_libvirt_vddk.ml
@@ -21,7 +21,7 @@
open Unix
open Common_gettext.Gettext
-open Common_utils
+open Tools_utils
open Std_utils
open Unix_utils
diff --git a/v2v/input_libvirt_xen_ssh.ml b/v2v/input_libvirt_xen_ssh.ml
index fd3da2c44..a1b1dfa1e 100644
--- a/v2v/input_libvirt_xen_ssh.ml
+++ b/v2v/input_libvirt_xen_ssh.ml
@@ -19,7 +19,7 @@
(** [-i libvirt] when the source is Xen *)
open Common_gettext.Gettext
-open Common_utils
+open Tools_utils
open Types
open Xml
diff --git a/v2v/input_libvirtxml.ml b/v2v/input_libvirtxml.ml
index 570541d7d..746a8202b 100644
--- a/v2v/input_libvirtxml.ml
+++ b/v2v/input_libvirtxml.ml
@@ -19,7 +19,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Types
diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml
index d521a9fc8..0be38ec27 100644
--- a/v2v/input_ova.ml
+++ b/v2v/input_ova.ml
@@ -19,7 +19,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Unix_utils
open Common_gettext.Gettext
diff --git a/v2v/input_vmx.ml b/v2v/input_vmx.ml
index bb1650ae9..a6f138787 100644
--- a/v2v/input_vmx.ml
+++ b/v2v/input_vmx.ml
@@ -20,7 +20,7 @@ open Printf
open Scanf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Types
diff --git a/v2v/inspect_source.ml b/v2v/inspect_source.ml
index e5d1fd3aa..00197e2fa 100644
--- a/v2v/inspect_source.ml
+++ b/v2v/inspect_source.ml
@@ -19,7 +19,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
module G = Guestfs
diff --git a/v2v/linux.ml b/v2v/linux.ml
index a1c2c25a5..a5673f737 100644
--- a/v2v/linux.ml
+++ b/v2v/linux.ml
@@ -19,7 +19,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Types
diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml
index 59af38a86..548743749 100644
--- a/v2v/linux_bootloaders.ml
+++ b/v2v/linux_bootloaders.ml
@@ -19,7 +19,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Types
diff --git a/v2v/linux_kernels.ml b/v2v/linux_kernels.ml
index 9853b0029..59948cb61 100644
--- a/v2v/linux_kernels.ml
+++ b/v2v/linux_kernels.ml
@@ -21,7 +21,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Types
diff --git a/v2v/name_from_disk.ml b/v2v/name_from_disk.ml
index 452d9462c..4480835eb 100644
--- a/v2v/name_from_disk.ml
+++ b/v2v/name_from_disk.ml
@@ -17,7 +17,7 @@
*)
open Common_gettext.Gettext
-open Common_utils
+open Tools_utils
let name_from_disk disk =
let name = Filename.basename disk in
diff --git a/v2v/output_glance.ml b/v2v/output_glance.ml
index a9d267e28..ed7c89878 100644
--- a/v2v/output_glance.ml
+++ b/v2v/output_glance.ml
@@ -19,7 +19,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Unix_utils
open Common_gettext.Gettext
diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml
index bc7f41ff9..02b4d54ff 100644
--- a/v2v/output_libvirt.ml
+++ b/v2v/output_libvirt.ml
@@ -19,7 +19,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Types
diff --git a/v2v/output_local.ml b/v2v/output_local.ml
index de432fb88..93d643f03 100644
--- a/v2v/output_local.ml
+++ b/v2v/output_local.ml
@@ -19,7 +19,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Types
diff --git a/v2v/output_null.ml b/v2v/output_null.ml
index e2302fc47..d01f45654 100644
--- a/v2v/output_null.ml
+++ b/v2v/output_null.ml
@@ -19,7 +19,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Unix_utils
open Common_gettext.Gettext
diff --git a/v2v/output_qemu.ml b/v2v/output_qemu.ml
index 9e0c67a0b..021bf42df 100644
--- a/v2v/output_qemu.ml
+++ b/v2v/output_qemu.ml
@@ -19,7 +19,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Types
diff --git a/v2v/output_rhv.ml b/v2v/output_rhv.ml
index f1a193bde..c3b2294de 100644
--- a/v2v/output_rhv.ml
+++ b/v2v/output_rhv.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Unix_utils
open Common_gettext.Gettext
diff --git a/v2v/output_vdsm.ml b/v2v/output_vdsm.ml
index 361a8e555..5b4214b62 100644
--- a/v2v/output_vdsm.ml
+++ b/v2v/output_vdsm.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Unix
diff --git a/v2v/parse_libvirt_xml.ml b/v2v/parse_libvirt_xml.ml
index c71707000..40d558a5e 100644
--- a/v2v/parse_libvirt_xml.ml
+++ b/v2v/parse_libvirt_xml.ml
@@ -20,7 +20,7 @@ open Printf
open C_utils
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Xpath_helpers
diff --git a/v2v/parse_ovf_from_ova.ml b/v2v/parse_ovf_from_ova.ml
index 613e8d075..e3518e30d 100644
--- a/v2v/parse_ovf_from_ova.ml
+++ b/v2v/parse_ovf_from_ova.ml
@@ -19,7 +19,7 @@
(* Parse OVF from an externally produced OVA file. *)
open Std_utils
-open Common_utils
+open Tools_utils
open Unix_utils
open Common_gettext.Gettext
diff --git a/v2v/parse_vmx.ml b/v2v/parse_vmx.ml
index 271066eb9..3c72527b9 100644
--- a/v2v/parse_vmx.ml
+++ b/v2v/parse_vmx.ml
@@ -19,7 +19,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
(* As far as I can tell the VMX format is totally unspecified.
diff --git a/v2v/target_bus_assignment.ml b/v2v/target_bus_assignment.ml
index de6b0148d..b15a519e7 100644
--- a/v2v/target_bus_assignment.ml
+++ b/v2v/target_bus_assignment.ml
@@ -17,7 +17,7 @@
*)
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Types
diff --git a/v2v/test-harness/v2v_test_harness.ml b/v2v/test-harness/v2v_test_harness.ml
index ba8c5eeab..ae0033dde 100644
--- a/v2v/test-harness/v2v_test_harness.ml
+++ b/v2v/test-harness/v2v_test_harness.ml
@@ -24,7 +24,7 @@ open Unix
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
type test_plan = {
guest_clock : float option;
diff --git a/v2v/types.ml b/v2v/types.ml
index 484f1a3d3..c47c3987a 100644
--- a/v2v/types.ml
+++ b/v2v/types.ml
@@ -19,7 +19,7 @@
open Printf
open Common_gettext.Gettext
-open Common_utils
+open Tools_utils
(* Types. See types.mli for documentation. *)
diff --git a/v2v/utils.ml b/v2v/utils.ml
index 12ebe23f4..467fd9a12 100644
--- a/v2v/utils.ml
+++ b/v2v/utils.ml
@@ -21,7 +21,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
(* URI quoting. *)
diff --git a/v2v/v2v.ml b/v2v/v2v.ml
index 00fbff2bc..9d40f3578 100644
--- a/v2v/v2v.ml
+++ b/v2v/v2v.ml
@@ -21,7 +21,7 @@ open Printf
open C_utils
open Std_utils
-open Common_utils
+open Tools_utils
open Unix_utils
open Common_gettext.Gettext
diff --git a/v2v/v2v_unit_tests.ml b/v2v/v2v_unit_tests.ml
index 76f04f6fe..ee27fd67b 100644
--- a/v2v/v2v_unit_tests.ml
+++ b/v2v/v2v_unit_tests.ml
@@ -23,7 +23,7 @@ open Printf
open OUnit2
open Std_utils
-open Common_utils
+open Tools_utils
open Types
diff --git a/v2v/vCenter.ml b/v2v/vCenter.ml
index 434c93395..59292e093 100644
--- a/v2v/vCenter.ml
+++ b/v2v/vCenter.ml
@@ -19,7 +19,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Xml
diff --git a/v2v/windows.ml b/v2v/windows.ml
index fb68c86c9..5d5a3f09a 100644
--- a/v2v/windows.ml
+++ b/v2v/windows.ml
@@ -19,7 +19,7 @@
open Printf
open Common_gettext.Gettext
-open Common_utils
+open Tools_utils
open Utils
diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml
index 76af7ab2f..4aa45d100 100644
--- a/v2v/windows_virtio.ml
+++ b/v2v/windows_virtio.ml
@@ -19,7 +19,7 @@
open Printf
open Std_utils
-open Common_utils
+open Tools_utils
open Common_gettext.Gettext
open Regedit
--
2.13.2
More information about the Libguestfs
mailing list