From 293a30b0e7c354ea53634af493675988f686185c Mon Sep 17 00:00:00 2001 From: Rob Hoes Date: Mon, 29 Sep 2025 16:06:27 +0000 Subject: [PATCH 1/3] Fix missing-dependency alerts for unix and str on OCaml 5 OCaml 5 is particularly picky here and wants all those dependencies explicitly (and tediously) declared, otherwise it will print `ocaml_deprecated_auto_include` alerts. In the case of `unix`, it is used nearly everywhere. Signed-off-by: Rob Hoes --- ocaml/database/dune | 4 ++++ ocaml/doc/dune | 1 + ocaml/forkexecd/cli/dune | 2 +- ocaml/forkexecd/lib/dune | 1 + ocaml/forkexecd/src/dune | 1 + ocaml/forkexecd/test/dune | 2 +- ocaml/gencert/dune | 2 ++ ocaml/idl/dune | 1 + ocaml/idl/json_backend/dune | 1 + ocaml/libs/clock/dune | 1 + ocaml/libs/ezxenstore/core/dune | 1 + ocaml/libs/ezxenstore/lib_test/dune | 2 +- ocaml/libs/ezxenstore/watch/dune | 1 + ocaml/libs/http-lib/dune | 6 +++++- ocaml/libs/log/dune | 1 + ocaml/libs/open-uri/dune | 1 + ocaml/libs/pciutil/dune | 1 + ocaml/libs/resources/dune | 1 + ocaml/libs/resources/test/dune | 1 + ocaml/libs/sexpr/test/dune | 2 +- ocaml/libs/stunnel/dune | 1 + ocaml/libs/tgroup/dune | 2 +- ocaml/libs/tracing/dune | 3 ++- ocaml/libs/vhd/disk/dune | 2 +- ocaml/libs/vhd/vhd_format/dune | 2 +- ocaml/libs/vhd/vhd_format_lwt/dune | 2 +- ocaml/libs/vhd/vhd_format_lwt_test/dune | 2 +- ocaml/libs/xapi-compression/dune | 3 ++- ocaml/libs/xapi-inventory/lib/dune | 1 + ocaml/libs/xapi-stdext/lib/xapi-fd-test/test/dune | 2 +- ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/dune | 2 +- ocaml/libs/xapi-stdext/lib/xapi-stdext-threads/dune | 1 + ocaml/libs/xapi-stdext/lib/xapi-stdext-unix/test/dune | 4 ++-- ocaml/message-switch/cli/dune | 1 + ocaml/message-switch/core/dune | 1 + ocaml/message-switch/core_test/dune | 1 + ocaml/message-switch/core_test/lwt/dune | 1 + ocaml/message-switch/lwt/dune | 1 + ocaml/message-switch/switch/dune | 1 + ocaml/message-switch/unix/dune | 1 + ocaml/mpathalert/dune | 1 + ocaml/nbd/lib/dune | 2 ++ ocaml/nbd/lib_test/dune | 1 + ocaml/nbd/src/dune | 1 + ocaml/networkd/bin/dune | 1 + ocaml/networkd/bin_db/dune | 2 +- ocaml/networkd/lib/dune | 1 + ocaml/networkd/test/dune | 2 +- ocaml/qcow-stream-tool/dune | 1 + ocaml/rrd2csv/src/dune | 1 + ocaml/sdk-gen/common/dune | 2 +- ocaml/sdk-gen/go/dune | 1 + ocaml/sdk-gen/java/dune | 1 + ocaml/squeezed/src/dune | 2 +- ocaml/tapctl/dune | 1 + ocaml/tests/common/dune | 1 + ocaml/tests/dune | 3 +++ ocaml/vhd-tool/cli/dune | 1 + ocaml/vhd-tool/src/dune | 1 + ocaml/vncproxy/dune | 1 + ocaml/wsproxy/cli/dune | 1 + ocaml/wsproxy/src/dune | 2 +- ocaml/xapi-aux/dune | 1 + ocaml/xapi-cli-protocol/dune | 1 + ocaml/xapi-cli-server/dune | 1 + ocaml/xapi-client/dune | 1 + ocaml/xapi-guard/lib/dune | 2 ++ ocaml/xapi-guard/src/dune | 1 + ocaml/xapi-idl/example/dune | 1 + ocaml/xapi-idl/lib/dune | 1 + ocaml/xapi-idl/lib_test/dune | 4 +++- ocaml/xapi-idl/network/dune | 1 + ocaml/xapi-idl/storage/dune | 3 ++- ocaml/xapi-idl/v6/dune | 1 + ocaml/xapi-storage-cli/dune | 2 +- ocaml/xapi-storage-script/dune | 4 +++- ocaml/xapi-storage/generator/test/dune | 1 + ocaml/xapi-types/dune | 1 + ocaml/xapi/dune | 6 ++++++ ocaml/xcp-rrdd/bin/rrdd/dune | 2 ++ ocaml/xcp-rrdd/bin/rrdp-iostat/dune | 1 + ocaml/xcp-rrdd/bin/rrdp-squeezed/dune | 1 + ocaml/xcp-rrdd/bin/rrdview/dune | 1 + ocaml/xcp-rrdd/bin/transport-rw/dune | 2 +- ocaml/xcp-rrdd/lib/blktap/lib/dune | 1 + ocaml/xcp-rrdd/lib/plugin/dune | 3 +++ ocaml/xcp-rrdd/lib/rrdd/dune | 1 + ocaml/xcp-rrdd/lib/transport/file/dune | 1 + ocaml/xcp-rrdd/test/transport/dune | 2 +- ocaml/xe-cli/dune | 1 + ocaml/xen-api-client/lwt/dune | 1 + ocaml/xen-api-client/lwt_examples/dune | 2 +- ocaml/xenopsd/cli/dune | 1 + ocaml/xenopsd/dbgring/dune | 1 + ocaml/xenopsd/lib/dune | 1 + ocaml/xenopsd/pvs/dune | 2 +- ocaml/xenopsd/suspend_image_viewer/dune | 1 + ocaml/xenopsd/test/dune | 1 + ocaml/xenopsd/xc/dune | 6 ++++-- ocaml/xs-trace/dune | 2 +- ocaml/xsh/dune | 1 + 101 files changed, 132 insertions(+), 32 deletions(-) diff --git a/ocaml/database/dune b/ocaml/database/dune index 7422d6dc900..74b6c512d66 100644 --- a/ocaml/database/dune +++ b/ocaml/database/dune @@ -51,6 +51,7 @@ threads.posix http_lib httpsvr + unix uuid xapi-backtrace xapi-datamodel @@ -78,6 +79,7 @@ (name block_device_io) (modules block_device_io) (libraries + unix xapi_database xapi-log xapi-stdext-pervasives @@ -98,6 +100,7 @@ http_lib httpsvr threads.posix + unix xapi_database xapi-stdext-threads xapi-stdext-unix)) @@ -113,6 +116,7 @@ rpclib.xml sexplib sexplib0 + unix xapi_database xml-light2)) diff --git a/ocaml/doc/dune b/ocaml/doc/dune index 9c4bb6cd474..061ba778232 100644 --- a/ocaml/doc/dune +++ b/ocaml/doc/dune @@ -5,6 +5,7 @@ mustache rpclib.core rpclib.json + unix uuid xapi-consts xapi-datamodel diff --git a/ocaml/forkexecd/cli/dune b/ocaml/forkexecd/cli/dune index 2189925a2bc..e0fbc15d327 100644 --- a/ocaml/forkexecd/cli/dune +++ b/ocaml/forkexecd/cli/dune @@ -1,7 +1,7 @@ (executable (modes exe) (name fe_cli) - (libraries forkexec)) + (libraries forkexec unix)) (install (package xapi-forkexecd) diff --git a/ocaml/forkexecd/lib/dune b/ocaml/forkexecd/lib/dune index 213ee173e1a..90db94c2a53 100644 --- a/ocaml/forkexecd/lib/dune +++ b/ocaml/forkexecd/lib/dune @@ -10,6 +10,7 @@ rpclib.core rpclib.json rpclib.xml + unix uuid xapi-backtrace xapi-log diff --git a/ocaml/forkexecd/src/dune b/ocaml/forkexecd/src/dune index 77c396de6bd..a31f143e8e9 100644 --- a/ocaml/forkexecd/src/dune +++ b/ocaml/forkexecd/src/dune @@ -5,6 +5,7 @@ astring fd-send-recv forkexec + unix uuid xapi-log xapi-stdext-unix diff --git a/ocaml/forkexecd/test/dune b/ocaml/forkexecd/test/dune index bba6499fd1e..1ab42b893b7 100644 --- a/ocaml/forkexecd/test/dune +++ b/ocaml/forkexecd/test/dune @@ -1,7 +1,7 @@ (executable (modes exe) (name fe_test) - (libraries fmt forkexec mtime clock mtime.clock.os uuid xapi-stdext-unix fd-send-recv xapi-log)) + (libraries fmt forkexec mtime clock mtime.clock.os str uuid xapi-stdext-unix fd-send-recv xapi-log unix)) ; preload library to redirect "/dev/log" (rule diff --git a/ocaml/gencert/dune b/ocaml/gencert/dune index 608b274963f..19ef8f1b33a 100644 --- a/ocaml/gencert/dune +++ b/ocaml/gencert/dune @@ -16,6 +16,7 @@ ptime.clock.os result rresult + unix x509 xapi-backtrace xapi-consts @@ -32,6 +33,7 @@ (libraries astring gencertlib + unix x509 xapi-inventory xapi_aux diff --git a/ocaml/idl/dune b/ocaml/idl/dune index c49fb097cee..bc22a311cd7 100644 --- a/ocaml/idl/dune +++ b/ocaml/idl/dune @@ -33,6 +33,7 @@ xapi-stdext-std xapi-stdext-pervasives xapi-stdext-unix + unix ) ) diff --git a/ocaml/idl/json_backend/dune b/ocaml/idl/json_backend/dune index c03bead0cd8..6a16181c453 100644 --- a/ocaml/idl/json_backend/dune +++ b/ocaml/idl/json_backend/dune @@ -3,6 +3,7 @@ (name gen_json) (libraries fmt + unix xapi-datamodel xapi-consts xapi-stdext-unix diff --git a/ocaml/libs/clock/dune b/ocaml/libs/clock/dune index a2afef36460..19a2e9bf0e0 100644 --- a/ocaml/libs/clock/dune +++ b/ocaml/libs/clock/dune @@ -21,6 +21,7 @@ fmt mtime.clock.os qcheck-core + unix ) ) diff --git a/ocaml/libs/ezxenstore/core/dune b/ocaml/libs/ezxenstore/core/dune index c7f5f636bca..5575342a2b1 100644 --- a/ocaml/libs/ezxenstore/core/dune +++ b/ocaml/libs/ezxenstore/core/dune @@ -5,6 +5,7 @@ cmdliner logs threads + unix uuidm (re_export xenstore) (re_export xenstore_transport) diff --git a/ocaml/libs/ezxenstore/lib_test/dune b/ocaml/libs/ezxenstore/lib_test/dune index da843bf3b11..83f42acdd8d 100644 --- a/ocaml/libs/ezxenstore/lib_test/dune +++ b/ocaml/libs/ezxenstore/lib_test/dune @@ -2,5 +2,5 @@ (name main) (package ezxenstore) (deps main.exe) - (libraries cmdliner ezxenstore xenstore_transport xenstore xenstore.unix) + (libraries cmdliner ezxenstore xenstore_transport xenstore xenstore.unix unix) ) diff --git a/ocaml/libs/ezxenstore/watch/dune b/ocaml/libs/ezxenstore/watch/dune index dfd2f3020cb..630eee3111e 100644 --- a/ocaml/libs/ezxenstore/watch/dune +++ b/ocaml/libs/ezxenstore/watch/dune @@ -7,5 +7,6 @@ xenctrl uuidm threads.posix + unix ) ) diff --git a/ocaml/libs/http-lib/dune b/ocaml/libs/http-lib/dune index 184fd5b2869..4e8d255b6bd 100644 --- a/ocaml/libs/http-lib/dune +++ b/ocaml/libs/http-lib/dune @@ -31,6 +31,7 @@ sha stunnel threads.posix + unix uuid uri xapi-backtrace @@ -57,6 +58,7 @@ threads.posix tracing tracing_propagator + unix uri xapi-backtrace xapi-log @@ -70,7 +72,7 @@ (modes (best exe)) (modules http_test radix_tree_test) - (libraries alcotest fmt http_lib)) + (libraries alcotest fmt http_lib unix)) (executable (modes exe) @@ -81,6 +83,7 @@ safe-resources stunnel threads.posix + unix xapi-backtrace xapi-log xapi-stdext-pervasives @@ -95,6 +98,7 @@ httpsvr safe-resources threads.posix + unix xapi-stdext-threads xapi-stdext-unix)) diff --git a/ocaml/libs/log/dune b/ocaml/libs/log/dune index 42e5f664119..8b4c2a1d512 100644 --- a/ocaml/libs/log/dune +++ b/ocaml/libs/log/dune @@ -11,6 +11,7 @@ logs threads.posix xapi-backtrace + unix ) (wrapped false) ) diff --git a/ocaml/libs/open-uri/dune b/ocaml/libs/open-uri/dune index d5291c77fd4..4bf141d3a5b 100644 --- a/ocaml/libs/open-uri/dune +++ b/ocaml/libs/open-uri/dune @@ -5,6 +5,7 @@ cohttp safe-resources stunnel + unix uri xapi-backtrace xapi-consts diff --git a/ocaml/libs/pciutil/dune b/ocaml/libs/pciutil/dune index 23353d9bb8f..44240eff3d8 100644 --- a/ocaml/libs/pciutil/dune +++ b/ocaml/libs/pciutil/dune @@ -3,6 +3,7 @@ (public_name pciutil) (libraries threads + unix xapi-stdext-unix ) ) diff --git a/ocaml/libs/resources/dune b/ocaml/libs/resources/dune index 6fa2d3d2ec4..358d7c799c5 100644 --- a/ocaml/libs/resources/dune +++ b/ocaml/libs/resources/dune @@ -6,6 +6,7 @@ xapi-backtrace fmt threads.posix + unix xapi-stdext-pervasives xapi-stdext-threads ) diff --git a/ocaml/libs/resources/test/dune b/ocaml/libs/resources/test/dune index 15a20f0bfa3..d094fb54fd9 100644 --- a/ocaml/libs/resources/test/dune +++ b/ocaml/libs/resources/test/dune @@ -7,5 +7,6 @@ logs logs.fmt alcotest + unix ) ) diff --git a/ocaml/libs/sexpr/test/dune b/ocaml/libs/sexpr/test/dune index 78aa0ac6052..2e8cd323f2b 100644 --- a/ocaml/libs/sexpr/test/dune +++ b/ocaml/libs/sexpr/test/dune @@ -2,4 +2,4 @@ (name test_sexpr) (package sexpr) (modules test_sexpr) - (libraries sexpr astring rresult qcheck-core alcotest threads.posix)) + (libraries sexpr astring rresult qcheck-core alcotest threads.posix unix)) diff --git a/ocaml/libs/stunnel/dune b/ocaml/libs/stunnel/dune index fedd5afc05f..21803706ce4 100644 --- a/ocaml/libs/stunnel/dune +++ b/ocaml/libs/stunnel/dune @@ -7,6 +7,7 @@ forkexec safe-resources threads.posix + unix uuid xapi-consts xapi-inventory diff --git a/ocaml/libs/tgroup/dune b/ocaml/libs/tgroup/dune index cff00ee1157..6c152a5c2ef 100644 --- a/ocaml/libs/tgroup/dune +++ b/ocaml/libs/tgroup/dune @@ -2,7 +2,7 @@ (name tgroup) (modules tgroup) (public_name tgroup) - (libraries xapi-log xapi-stdext-unix xapi-stdext-std)) + (libraries unix xapi-log xapi-stdext-unix xapi-stdext-std)) (test (name test_tgroup) diff --git a/ocaml/libs/tracing/dune b/ocaml/libs/tracing/dune index b941a765ce4..ef48705283a 100644 --- a/ocaml/libs/tracing/dune +++ b/ocaml/libs/tracing/dune @@ -1,7 +1,7 @@ (library (name tracing) (modules tracing) - (libraries astring re uri yojson xapi-log xapi-stdext-threads threads.posix) + (libraries astring re uri yojson xapi-log xapi-stdext-threads threads.posix unix) (preprocess (pps ppx_deriving_yojson)) (public_name xapi-tracing)) @@ -21,6 +21,7 @@ rresult tracing threads.posix + unix uri xapi-log xapi-open-uri diff --git a/ocaml/libs/vhd/disk/dune b/ocaml/libs/vhd/disk/dune index 83eabf18f64..f9447c3592e 100644 --- a/ocaml/libs/vhd/disk/dune +++ b/ocaml/libs/vhd/disk/dune @@ -1,3 +1,3 @@ (library (name disk) - (libraries cstruct lwt lwt.unix)) + (libraries cstruct lwt lwt.unix unix)) diff --git a/ocaml/libs/vhd/vhd_format/dune b/ocaml/libs/vhd/vhd_format/dune index 5478cb41a48..bafac365189 100644 --- a/ocaml/libs/vhd/vhd_format/dune +++ b/ocaml/libs/vhd/vhd_format/dune @@ -2,5 +2,5 @@ (name vhd_format) (public_name vhd-format) (flags :standard -w -32-34-37) - (libraries stdlib-shims (re_export bigarray-compat) cstruct io-page rresult uuidm) + (libraries stdlib-shims (re_export bigarray-compat) cstruct io-page rresult unix uuidm) (preprocess (pps ppx_cstruct))) diff --git a/ocaml/libs/vhd/vhd_format_lwt/dune b/ocaml/libs/vhd/vhd_format_lwt/dune index 06f37079439..1d4b857a862 100644 --- a/ocaml/libs/vhd/vhd_format_lwt/dune +++ b/ocaml/libs/vhd/vhd_format_lwt/dune @@ -1,7 +1,7 @@ (library (name vhd_format_lwt) (public_name vhd-format-lwt) - (libraries bigarray-compat cstruct-lwt cstruct lwt lwt.unix mirage-block vhd-format rresult) + (libraries bigarray-compat cstruct-lwt cstruct lwt lwt.unix mirage-block vhd-format rresult unix) (foreign_stubs (language c) (names blkgetsize64_stubs lseek64_stubs odirect_stubs))) diff --git a/ocaml/libs/vhd/vhd_format_lwt_test/dune b/ocaml/libs/vhd/vhd_format_lwt_test/dune index d8ece640123..390f816a45e 100644 --- a/ocaml/libs/vhd/vhd_format_lwt_test/dune +++ b/ocaml/libs/vhd/vhd_format_lwt_test/dune @@ -2,4 +2,4 @@ (name parse_test) (package vhd-format-lwt) (libraries alcotest alcotest-lwt cstruct disk fmt io-page lwt lwt.unix vhd-format - vhd_format_lwt)) + vhd_format_lwt unix)) diff --git a/ocaml/libs/xapi-compression/dune b/ocaml/libs/xapi-compression/dune index e366bed1716..c07999d967f 100644 --- a/ocaml/libs/xapi-compression/dune +++ b/ocaml/libs/xapi-compression/dune @@ -6,6 +6,7 @@ forkexec threads safe-resources + unix xapi-log xapi-stdext-pervasives xapi-stdext-unix @@ -19,4 +20,4 @@ ; don't install this ; (public_name xapi-gzip) ; (package xapi-compression) - (libraries xapi_compression cmdliner)) + (libraries xapi_compression cmdliner unix)) diff --git a/ocaml/libs/xapi-inventory/lib/dune b/ocaml/libs/xapi-inventory/lib/dune index 905b47bfceb..7f39303e6cb 100644 --- a/ocaml/libs/xapi-inventory/lib/dune +++ b/ocaml/libs/xapi-inventory/lib/dune @@ -5,6 +5,7 @@ (libraries uuidm astring + unix xapi-stdext-unix xapi-stdext-threads threads.posix diff --git a/ocaml/libs/xapi-stdext/lib/xapi-fd-test/test/dune b/ocaml/libs/xapi-stdext/lib/xapi-fd-test/test/dune index 29ea531dcad..55ffc4bfac6 100644 --- a/ocaml/libs/xapi-stdext/lib/xapi-fd-test/test/dune +++ b/ocaml/libs/xapi-stdext/lib/xapi-fd-test/test/dune @@ -2,5 +2,5 @@ (test (package xapi-stdext-unix) (name test_xapi_fd_test) - (libraries xapi_fd_test alcotest fmt mtime.clock.os) + (libraries xapi_fd_test alcotest fmt mtime.clock.os unix) ) diff --git a/ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/dune b/ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/dune index a70e4820c9b..b4edea2053c 100644 --- a/ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/dune +++ b/ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/dune @@ -1,7 +1,7 @@ (tests (package xapi-stdext-unix) (names test_safefd test_properties test_operations) - (libraries xapi_fdcaps alcotest fmt) + (libraries xapi_fdcaps alcotest fmt unix) ) (cram diff --git a/ocaml/libs/xapi-stdext/lib/xapi-stdext-threads/dune b/ocaml/libs/xapi-stdext/lib/xapi-stdext-threads/dune index 0dc52b78cd8..6915eaee073 100644 --- a/ocaml/libs/xapi-stdext/lib/xapi-stdext-threads/dune +++ b/ocaml/libs/xapi-stdext/lib/xapi-stdext-threads/dune @@ -43,5 +43,6 @@ fmt tgroup threads.posix + unix xapi_stdext_threads_scheduler) ) diff --git a/ocaml/libs/xapi-stdext/lib/xapi-stdext-unix/test/dune b/ocaml/libs/xapi-stdext/lib/xapi-stdext-unix/test/dune index 3b116a07983..71e902d50da 100644 --- a/ocaml/libs/xapi-stdext/lib/xapi-stdext-unix/test/dune +++ b/ocaml/libs/xapi-stdext/lib/xapi-stdext-unix/test/dune @@ -1,7 +1,7 @@ (library (name unixext_test) (modules unixext_test) - (libraries clock xapi_stdext_unix qcheck-core mtime.clock.os fmt xapi_fd_test mtime threads.posix rresult) + (libraries clock xapi_stdext_unix qcheck-core mtime.clock.os fmt xapi_fd_test mtime threads.posix rresult unix) ) (test @@ -25,7 +25,7 @@ (name test_systemd) (package xapi-stdext-unix) (modules test_systemd) - (libraries xapi-stdext-unix)) + (libraries xapi-stdext-unix unix)) (cram (package xapi-stdext-unix) diff --git a/ocaml/message-switch/cli/dune b/ocaml/message-switch/cli/dune index c0741e71348..95c0cbbc7ff 100644 --- a/ocaml/message-switch/cli/dune +++ b/ocaml/message-switch/cli/dune @@ -9,6 +9,7 @@ rpclib.core rpclib.json threads.posix + unix ) (preprocess (pps ppx_deriving_rpc)) ) diff --git a/ocaml/message-switch/core/dune b/ocaml/message-switch/core/dune index c9b5b3e2cff..2f9ef9345cd 100644 --- a/ocaml/message-switch/core/dune +++ b/ocaml/message-switch/core/dune @@ -10,6 +10,7 @@ sexplib0 threads.posix tracing + unix uri xapi-log xapi-stdext-threads diff --git a/ocaml/message-switch/core_test/dune b/ocaml/message-switch/core_test/dune index 92317ba71c3..e3c14b1d58d 100644 --- a/ocaml/message-switch/core_test/dune +++ b/ocaml/message-switch/core_test/dune @@ -15,6 +15,7 @@ message-switch-core message-switch-lwt threads.posix + unix ) ) diff --git a/ocaml/message-switch/core_test/lwt/dune b/ocaml/message-switch/core_test/lwt/dune index d08db56b3a4..250cfc3ccff 100644 --- a/ocaml/message-switch/core_test/lwt/dune +++ b/ocaml/message-switch/core_test/lwt/dune @@ -13,6 +13,7 @@ message-switch-core message-switch-lwt uri + unix ) ) diff --git a/ocaml/message-switch/lwt/dune b/ocaml/message-switch/lwt/dune index 12f03301298..197c4813f60 100644 --- a/ocaml/message-switch/lwt/dune +++ b/ocaml/message-switch/lwt/dune @@ -4,6 +4,7 @@ (libraries cohttp-lwt-unix message-switch-core + unix (re_export lwt) (re_export lwt.unix) ) diff --git a/ocaml/message-switch/switch/dune b/ocaml/message-switch/switch/dune index e543584a896..284dd321863 100644 --- a/ocaml/message-switch/switch/dune +++ b/ocaml/message-switch/switch/dune @@ -26,6 +26,7 @@ shared-block-ring sexplib sexplib0 + unix uri ) (preprocess (per_module ((pps ppx_sexp_conv) Logging Q Switch_main))) diff --git a/ocaml/message-switch/unix/dune b/ocaml/message-switch/unix/dune index 1858aa271b3..4a1c65a9463 100644 --- a/ocaml/message-switch/unix/dune +++ b/ocaml/message-switch/unix/dune @@ -12,6 +12,7 @@ rpclib.json threads.posix tracing + unix xapi-stdext-threads xapi-stdext-unix ) diff --git a/ocaml/mpathalert/dune b/ocaml/mpathalert/dune index 2a46ae7e524..bdfab00c4bc 100644 --- a/ocaml/mpathalert/dune +++ b/ocaml/mpathalert/dune @@ -6,6 +6,7 @@ (libraries http_lib threads.posix + unix uuid xapi-client xapi-consts diff --git a/ocaml/nbd/lib/dune b/ocaml/nbd/lib/dune index 8bcbdc6dd78..5fa68e1b776 100644 --- a/ocaml/nbd/lib/dune +++ b/ocaml/nbd/lib/dune @@ -14,6 +14,7 @@ lwt_log lwt.unix rpclib.core + unix xapi-types xen-api-client-lwt ) @@ -26,6 +27,7 @@ lwt lwt_log lwt.unix + unix ) (modules vbd_store) ) diff --git a/ocaml/nbd/lib_test/dune b/ocaml/nbd/lib_test/dune index 7da1f7d8e1e..0c00b1f6eff 100644 --- a/ocaml/nbd/lib_test/dune +++ b/ocaml/nbd/lib_test/dune @@ -5,6 +5,7 @@ alcotest alcotest-lwt lwt + unix uuid vbd_store) ) diff --git a/ocaml/nbd/src/dune b/ocaml/nbd/src/dune index 02c9dc6a0ed..61bb892e2e1 100644 --- a/ocaml/nbd/src/dune +++ b/ocaml/nbd/src/dune @@ -15,6 +15,7 @@ nbd-unix rpclib.core uri + unix uuid vbd_store xapi-consts diff --git a/ocaml/networkd/bin/dune b/ocaml/networkd/bin/dune index be140076b58..a9d446007c6 100644 --- a/ocaml/networkd/bin/dune +++ b/ocaml/networkd/bin/dune @@ -26,6 +26,7 @@ result rresult threads.posix + unix xapi-client xapi-consts xapi-consts.xapi_version diff --git a/ocaml/networkd/bin_db/dune b/ocaml/networkd/bin_db/dune index 6997bd74d00..16a1ca8db18 100644 --- a/ocaml/networkd/bin_db/dune +++ b/ocaml/networkd/bin_db/dune @@ -4,7 +4,7 @@ (package xapi-tools) (modes exe) (libraries - networklibs + unix xapi-idl.network) ) diff --git a/ocaml/networkd/lib/dune b/ocaml/networkd/lib/dune index 548d326a4b2..763b3e9807d 100644 --- a/ocaml/networkd/lib/dune +++ b/ocaml/networkd/lib/dune @@ -13,6 +13,7 @@ rpclib.json rresult threads.posix + unix uri xapi-stdext-pervasives xapi-stdext-std diff --git a/ocaml/networkd/test/dune b/ocaml/networkd/test/dune index b3519ce2ec5..86feeb4b17c 100644 --- a/ocaml/networkd/test/dune +++ b/ocaml/networkd/test/dune @@ -4,11 +4,11 @@ (libraries alcotest astring - fmt networklibs rpclib.core rpclib.json + unix xapi-log xapi-test-utils) ) diff --git a/ocaml/qcow-stream-tool/dune b/ocaml/qcow-stream-tool/dune index 2125dea0a0c..4daf3469dc5 100644 --- a/ocaml/qcow-stream-tool/dune +++ b/ocaml/qcow-stream-tool/dune @@ -6,5 +6,6 @@ (libraries qcow-stream cmdliner + unix ) ) diff --git a/ocaml/rrd2csv/src/dune b/ocaml/rrd2csv/src/dune index 28f26f831c2..a04e8dc33cf 100644 --- a/ocaml/rrd2csv/src/dune +++ b/ocaml/rrd2csv/src/dune @@ -7,6 +7,7 @@ http_lib threads.posix + unix xapi-idl.rrd xapi-client xapi-rrd diff --git a/ocaml/sdk-gen/common/dune b/ocaml/sdk-gen/common/dune index 1475ba4da8d..1b4bd0bc641 100644 --- a/ocaml/sdk-gen/common/dune +++ b/ocaml/sdk-gen/common/dune @@ -2,5 +2,5 @@ (name CommonFunctions) (modes best) (wrapped false) - (libraries astring xapi-datamodel mustache xapi-stdext-std xapi-stdext-unix) + (libraries astring xapi-datamodel mustache unix xapi-stdext-std xapi-stdext-unix) (modules_without_implementation license)) diff --git a/ocaml/sdk-gen/go/dune b/ocaml/sdk-gen/go/dune index 64717b85c6d..f8f6999dd0e 100644 --- a/ocaml/sdk-gen/go/dune +++ b/ocaml/sdk-gen/go/dune @@ -5,6 +5,7 @@ (libraries CommonFunctions mustache + unix xapi-datamodel xapi-stdext-unix gen_go_helper)) diff --git a/ocaml/sdk-gen/java/dune b/ocaml/sdk-gen/java/dune index 31fd56640a6..49abc099b49 100644 --- a/ocaml/sdk-gen/java/dune +++ b/ocaml/sdk-gen/java/dune @@ -6,6 +6,7 @@ CommonFunctions mustache str + unix xapi-datamodel xapi-stdext-unix)) diff --git a/ocaml/squeezed/src/dune b/ocaml/squeezed/src/dune index bb73a91f39d..4e9fe643097 100644 --- a/ocaml/squeezed/src/dune +++ b/ocaml/squeezed/src/dune @@ -8,10 +8,10 @@ xapi-stdext-unix xapi_version astring - rpclib.core squeeze threads.posix + unix xenctrl xenstore xenstore.unix diff --git a/ocaml/tapctl/dune b/ocaml/tapctl/dune index 903e35a63d4..b4b23f99514 100644 --- a/ocaml/tapctl/dune +++ b/ocaml/tapctl/dune @@ -10,6 +10,7 @@ rpclib.json threads.posix forkexec + unix xapi-stdext-unix xapi-stdext-threads ) diff --git a/ocaml/tests/common/dune b/ocaml/tests/common/dune index 20ec22dcbbd..55741b8e67a 100644 --- a/ocaml/tests/common/dune +++ b/ocaml/tests/common/dune @@ -12,6 +12,7 @@ rpclib.xml threads.posix uuid + unix xapi_aux xapi-consts xapi_database diff --git a/ocaml/tests/dune b/ocaml/tests/dune index 9f4ad45b9d9..f829e72c88c 100644 --- a/ocaml/tests/dune +++ b/ocaml/tests/dune @@ -31,6 +31,7 @@ tests_common threads.posix uuid + unix xapi-backtrace xapi-consts xapi-datamodel @@ -71,6 +72,7 @@ http_lib xapi-log clock + unix xapi-types xapi_internal xapi_internal_server @@ -102,6 +104,7 @@ rresult tests_common threads.posix + unix uuid xapi-client xapi-consts diff --git a/ocaml/vhd-tool/cli/dune b/ocaml/vhd-tool/cli/dune index 5dea7468c10..095b9edaf91 100644 --- a/ocaml/vhd-tool/cli/dune +++ b/ocaml/vhd-tool/cli/dune @@ -13,6 +13,7 @@ ssl tapctl threads.posix + unix uri vhd-format vhd-format-lwt diff --git a/ocaml/vhd-tool/src/dune b/ocaml/vhd-tool/src/dune index 7aa9d0de704..9092e4e03e2 100644 --- a/ocaml/vhd-tool/src/dune +++ b/ocaml/vhd-tool/src/dune @@ -25,6 +25,7 @@ sha ssl tar + unix uri uuidm vhd-format diff --git a/ocaml/vncproxy/dune b/ocaml/vncproxy/dune index 97b89628334..53316e78315 100644 --- a/ocaml/vncproxy/dune +++ b/ocaml/vncproxy/dune @@ -7,6 +7,7 @@ http_lib stunnel + unix xapi-client xapi-consts xapi-types diff --git a/ocaml/wsproxy/cli/dune b/ocaml/wsproxy/cli/dune index 4d6e72bfe7d..5946052b1ac 100644 --- a/ocaml/wsproxy/cli/dune +++ b/ocaml/wsproxy/cli/dune @@ -14,6 +14,7 @@ lwt lwt.unix re + unix uuid wslib ) diff --git a/ocaml/wsproxy/src/dune b/ocaml/wsproxy/src/dune index 8513c2998c3..69ac8801a29 100644 --- a/ocaml/wsproxy/src/dune +++ b/ocaml/wsproxy/src/dune @@ -1,5 +1,5 @@ (library (name wslib) (modes best) - (libraries base64 lwt lwt.unix) + (libraries base64 lwt lwt.unix unix) ) diff --git a/ocaml/xapi-aux/dune b/ocaml/xapi-aux/dune index 60e27cf5b3b..8eebb6edc41 100644 --- a/ocaml/xapi-aux/dune +++ b/ocaml/xapi-aux/dune @@ -11,6 +11,7 @@ ipaddr.unix tar threads.posix + unix xapi-consts xapi-idl.network xapi-inventory diff --git a/ocaml/xapi-cli-protocol/dune b/ocaml/xapi-cli-protocol/dune index 72cc617c981..b6fab5f447b 100644 --- a/ocaml/xapi-cli-protocol/dune +++ b/ocaml/xapi-cli-protocol/dune @@ -3,6 +3,7 @@ (public_name xapi-cli-protocol) (libraries threads + unix xapi-stdext-unix ) (wrapped false) diff --git a/ocaml/xapi-cli-server/dune b/ocaml/xapi-cli-server/dune index 48984b74507..fb2a713dcf2 100644 --- a/ocaml/xapi-cli-server/dune +++ b/ocaml/xapi-cli-server/dune @@ -26,6 +26,7 @@ uri tar threads.posix + unix xapi-backtrace xapi-consts xapi_version diff --git a/ocaml/xapi-client/dune b/ocaml/xapi-client/dune index 57faa745006..e57195b20d0 100644 --- a/ocaml/xapi-client/dune +++ b/ocaml/xapi-client/dune @@ -16,6 +16,7 @@ mtime mtime.clock.os (re_export rpclib.core) + unix xapi-consts xapi-log xapi-types diff --git a/ocaml/xapi-guard/lib/dune b/ocaml/xapi-guard/lib/dune index e4eebc4cd80..cb6345496da 100644 --- a/ocaml/xapi-guard/lib/dune +++ b/ocaml/xapi-guard/lib/dune @@ -18,6 +18,7 @@ rpclib.core rpclib-lwt rpclib.xml + unix uuidm uri xapi_guard @@ -44,6 +45,7 @@ mtime mtime.clock mtime.clock.os + unix uuidm uri xapi-backtrace diff --git a/ocaml/xapi-guard/src/dune b/ocaml/xapi-guard/src/dune index 7c48635b73b..94a3ddd5cd4 100644 --- a/ocaml/xapi-guard/src/dune +++ b/ocaml/xapi-guard/src/dune @@ -13,6 +13,7 @@ rpclib.core rpclib.json rpclib-lwt + unix uuidm xapi_guard xapi_guard_server diff --git a/ocaml/xapi-idl/example/dune b/ocaml/xapi-idl/example/dune index db360ff8030..8fb2d217c84 100644 --- a/ocaml/xapi-idl/example/dune +++ b/ocaml/xapi-idl/example/dune @@ -3,6 +3,7 @@ (libraries astring rpclib.core + unix xapi-consts.xapi_version xapi-idl xapi-log diff --git a/ocaml/xapi-idl/lib/dune b/ocaml/xapi-idl/lib/dune index 4f29504a97a..d91ba09b2c4 100644 --- a/ocaml/xapi-idl/lib/dune +++ b/ocaml/xapi-idl/lib/dune @@ -56,6 +56,7 @@ sexplib0 tracing threads.posix + unix xapi-backtrace xapi-idl xapi-log diff --git a/ocaml/xapi-idl/lib_test/dune b/ocaml/xapi-idl/lib_test/dune index 93a24966176..87dc6df26e7 100644 --- a/ocaml/xapi-idl/lib_test/dune +++ b/ocaml/xapi-idl/lib_test/dune @@ -4,7 +4,7 @@ (name test_lib) (modules idl_test_common) (libraries - (re_export alcotest) xapi-idl (re_export rpclib.core) rpclib.json rpclib.xml result) + (re_export alcotest) xapi-idl (re_export rpclib.core) rpclib.json rpclib.xml result unix) (wrapped false) ) @@ -13,6 +13,7 @@ (modules guard_interfaces_test) (libraries test_lib + unix xapi-idl.guard.privileged xapi-idl.guard.varstored ) @@ -52,6 +53,7 @@ rpclib.xml test_lib threads.posix + unix xapi-idl xapi-idl.cluster xapi-idl.rrd diff --git a/ocaml/xapi-idl/network/dune b/ocaml/xapi-idl/network/dune index d1016ae8821..2527a9ed2cc 100644 --- a/ocaml/xapi-idl/network/dune +++ b/ocaml/xapi-idl/network/dune @@ -8,6 +8,7 @@ rpclib.json rresult threads.posix + unix xapi-idl xapi-log ipaddr diff --git a/ocaml/xapi-idl/storage/dune b/ocaml/xapi-idl/storage/dune index f8fabe1b08b..0f1a487ff12 100644 --- a/ocaml/xapi-idl/storage/dune +++ b/ocaml/xapi-idl/storage/dune @@ -39,6 +39,7 @@ (libraries rpclib.core threads.posix + unix xapi-idl xapi-idl.storage.interface clock @@ -53,7 +54,7 @@ (libraries alcotest cmdliner - + unix xapi-idl xapi-idl.storage xapi-idl.storage.interface diff --git a/ocaml/xapi-idl/v6/dune b/ocaml/xapi-idl/v6/dune index 3fb2579af06..51ddb5707ee 100644 --- a/ocaml/xapi-idl/v6/dune +++ b/ocaml/xapi-idl/v6/dune @@ -7,6 +7,7 @@ rpclib.core rresult threads.posix + unix xapi-idl xapi-log ) diff --git a/ocaml/xapi-storage-cli/dune b/ocaml/xapi-storage-cli/dune index c59c5c1fad4..92322f692a5 100644 --- a/ocaml/xapi-storage-cli/dune +++ b/ocaml/xapi-storage-cli/dune @@ -1,7 +1,7 @@ (executable (name main) (libraries - + unix xapi-idl xapi-idl.storage xapi-idl.storage.interface diff --git a/ocaml/xapi-storage-script/dune b/ocaml/xapi-storage-script/dune index e60413bf36c..9f1f798df52 100644 --- a/ocaml/xapi-storage-script/dune +++ b/ocaml/xapi-storage-script/dune @@ -7,6 +7,7 @@ inotify.lwt lwt lwt.unix + unix rpclib.core ) (preprocess (pps ppx_deriving_rpc)) @@ -16,7 +17,7 @@ (name test_lib) (modules test_lib) (package xapi-storage-script) - (libraries alcotest alcotest-lwt lwt fmt private) + (libraries alcotest alcotest-lwt lwt fmt private unix) ) (executable @@ -42,6 +43,7 @@ sexplib0 uri threads.posix + unix xapi-backtrace xapi-consts xapi-consts.xapi_version diff --git a/ocaml/xapi-storage/generator/test/dune b/ocaml/xapi-storage/generator/test/dune index d37a25a8708..1897c393b43 100644 --- a/ocaml/xapi-storage/generator/test/dune +++ b/ocaml/xapi-storage/generator/test/dune @@ -7,6 +7,7 @@ lwt.unix rpclib.core rpclib.xml + unix xapi_storage ) ) diff --git a/ocaml/xapi-types/dune b/ocaml/xapi-types/dune index 3a49a7dca2e..8122674acf8 100644 --- a/ocaml/xapi-types/dune +++ b/ocaml/xapi-types/dune @@ -17,6 +17,7 @@ rpclib.core rpclib.json rpclib.xml + unix uuid xapi-consts clock diff --git a/ocaml/xapi/dune b/ocaml/xapi/dune index 3b0f0e1b843..a9b56bd6002 100644 --- a/ocaml/xapi/dune +++ b/ocaml/xapi/dune @@ -90,6 +90,7 @@ sexpr tgroup forkexec + unix xapi-idl xapi_aux xapi-stdext-std @@ -178,6 +179,7 @@ sexplib0 sexpr sha + str stunnel tapctl tar @@ -186,6 +188,7 @@ threads.posix tracing tracing_propagator + unix unixpwd uri uuid @@ -270,6 +273,7 @@ xapi_internal_minimal http_lib rpclib.core + unix xapi-types xapi-log xapi-stdext-encodings @@ -297,6 +301,7 @@ threads.posix tracing tracing_propagator + unix xapi-backtrace xapi-client xapi-consts @@ -326,6 +331,7 @@ (package xapi) (modules xapi_main) (libraries + unix xapi_internal xapi_internal_server xapi_internal_minimal diff --git a/ocaml/xcp-rrdd/bin/rrdd/dune b/ocaml/xcp-rrdd/bin/rrdd/dune index 2f215e8a7cf..5b8936e4f8b 100644 --- a/ocaml/xcp-rrdd/bin/rrdd/dune +++ b/ocaml/xcp-rrdd/bin/rrdd/dune @@ -17,6 +17,7 @@ rrd-transport.lib stunnel threads.posix + unix uuid xapi-backtrace xapi-consts @@ -53,6 +54,7 @@ rrdd_plugin_xenctrl rrd-transport threads.posix + unix uuid xapi-backtrace xapi-consts.xapi_version diff --git a/ocaml/xcp-rrdd/bin/rrdp-iostat/dune b/ocaml/xcp-rrdd/bin/rrdp-iostat/dune index 4ba37845e27..255beba0a83 100644 --- a/ocaml/xcp-rrdd/bin/rrdp-iostat/dune +++ b/ocaml/xcp-rrdd/bin/rrdp-iostat/dune @@ -16,6 +16,7 @@ str stringext threads.posix + unix uuid xapi-idl.rrd xapi-log diff --git a/ocaml/xcp-rrdd/bin/rrdp-squeezed/dune b/ocaml/xcp-rrdd/bin/rrdp-squeezed/dune index ca5b6ae7d88..75c8e1f5ab5 100644 --- a/ocaml/xcp-rrdd/bin/rrdp-squeezed/dune +++ b/ocaml/xcp-rrdd/bin/rrdp-squeezed/dune @@ -8,6 +8,7 @@ xapi-stdext-std ezxenstore ezxenstore.watch + unix xapi-idl.rrd xapi-log xapi-rrd diff --git a/ocaml/xcp-rrdd/bin/rrdview/dune b/ocaml/xcp-rrdd/bin/rrdview/dune index e2b2401ff76..fd56897dc07 100644 --- a/ocaml/xcp-rrdd/bin/rrdview/dune +++ b/ocaml/xcp-rrdd/bin/rrdview/dune @@ -4,6 +4,7 @@ ;(public_name rrdview) (libraries threads + unix xapi-rrd.unix bos.setup astring diff --git a/ocaml/xcp-rrdd/bin/transport-rw/dune b/ocaml/xcp-rrdd/bin/transport-rw/dune index b080d67bd84..1fc8a7ac1a0 100644 --- a/ocaml/xcp-rrdd/bin/transport-rw/dune +++ b/ocaml/xcp-rrdd/bin/transport-rw/dune @@ -5,7 +5,7 @@ (package xapi-tools) (libraries cmdliner - + unix rrd-transport threads.posix xapi-idl.rrd diff --git a/ocaml/xcp-rrdd/lib/blktap/lib/dune b/ocaml/xcp-rrdd/lib/blktap/lib/dune index bc79ab629d0..69634324286 100644 --- a/ocaml/xcp-rrdd/lib/blktap/lib/dune +++ b/ocaml/xcp-rrdd/lib/blktap/lib/dune @@ -4,6 +4,7 @@ (preprocess (pps ppx_cstruct)) (libraries cstruct-unix + unix ) ) diff --git a/ocaml/xcp-rrdd/lib/plugin/dune b/ocaml/xcp-rrdd/lib/plugin/dune index b927bcc1614..c23c13acfda 100644 --- a/ocaml/xcp-rrdd/lib/plugin/dune +++ b/ocaml/xcp-rrdd/lib/plugin/dune @@ -12,6 +12,7 @@ xapi-stdext-threads xapi-stdext-unix threads.posix + unix xapi-rrd rrd-transport.file rrd-transport.lib @@ -32,6 +33,7 @@ xenctrl ezxenstore.core uuid + unix xapi-log threads.posix ) @@ -48,6 +50,7 @@ rrd-transport.file rrd-transport.lib threads.posix + unix xapi-idl.rrd xapi-log xapi-stdext-threads diff --git a/ocaml/xcp-rrdd/lib/rrdd/dune b/ocaml/xcp-rrdd/lib/rrdd/dune index dd63ed88761..54f1b73cd4f 100644 --- a/ocaml/xcp-rrdd/lib/rrdd/dune +++ b/ocaml/xcp-rrdd/lib/rrdd/dune @@ -4,6 +4,7 @@ (flags (:standard -bin-annot)) (libraries threads.posix + unix xapi-log xapi-stdext-threads xapi_version diff --git a/ocaml/xcp-rrdd/lib/transport/file/dune b/ocaml/xcp-rrdd/lib/transport/file/dune index 37b20597ffb..ffe58c234ad 100644 --- a/ocaml/xcp-rrdd/lib/transport/file/dune +++ b/ocaml/xcp-rrdd/lib/transport/file/dune @@ -7,6 +7,7 @@ cstruct rrd_transport_lib threads.posix + unix ) ) diff --git a/ocaml/xcp-rrdd/test/transport/dune b/ocaml/xcp-rrdd/test/transport/dune index 4efd2bc042d..4a0f06b67af 100644 --- a/ocaml/xcp-rrdd/test/transport/dune +++ b/ocaml/xcp-rrdd/test/transport/dune @@ -3,9 +3,9 @@ (package rrd-transport) (libraries alcotest - fmt rrd-transport + unix xapi-idl.rrd xapi-rrd ) diff --git a/ocaml/xe-cli/dune b/ocaml/xe-cli/dune index 9141c1fab07..b61ec3cde63 100644 --- a/ocaml/xe-cli/dune +++ b/ocaml/xe-cli/dune @@ -11,6 +11,7 @@ stunnel threads tracing + unix uri yojson xapi-backtrace diff --git a/ocaml/xen-api-client/lwt/dune b/ocaml/xen-api-client/lwt/dune index 306a170d0c4..9db22c4370e 100644 --- a/ocaml/xen-api-client/lwt/dune +++ b/ocaml/xen-api-client/lwt/dune @@ -14,6 +14,7 @@ rpclib.json rpclib.xml ssl + unix uri xapi-client xapi-consts diff --git a/ocaml/xen-api-client/lwt_examples/dune b/ocaml/xen-api-client/lwt_examples/dune index 56d95a3e6d9..b3d8220f7a3 100644 --- a/ocaml/xen-api-client/lwt_examples/dune +++ b/ocaml/xen-api-client/lwt_examples/dune @@ -20,9 +20,9 @@ (modules upload_disk) (libraries cstruct - lwt lwt.unix + unix uri xapi-consts xapi-types diff --git a/ocaml/xenopsd/cli/dune b/ocaml/xenopsd/cli/dune index 9b4b9baa7d6..88d76bfa431 100644 --- a/ocaml/xenopsd/cli/dune +++ b/ocaml/xenopsd/cli/dune @@ -13,6 +13,7 @@ rpclib.json rresult threads + unix uuid uuidm xapi-idl diff --git a/ocaml/xenopsd/dbgring/dune b/ocaml/xenopsd/dbgring/dune index b9d4773b34e..3d31cdc0ecc 100644 --- a/ocaml/xenopsd/dbgring/dune +++ b/ocaml/xenopsd/dbgring/dune @@ -12,6 +12,7 @@ xenstore_transport xenstore_transport.unix threads + unix xapi-idl.xen rpclib.core uutf diff --git a/ocaml/xenopsd/lib/dune b/ocaml/xenopsd/lib/dune index 694327c44fe..a865cea18b2 100644 --- a/ocaml/xenopsd/lib/dune +++ b/ocaml/xenopsd/lib/dune @@ -21,6 +21,7 @@ sexplib sexplib0 stunnel + unix uri uuid uuidm diff --git a/ocaml/xenopsd/pvs/dune b/ocaml/xenopsd/pvs/dune index bbd88cbb772..1e4d25e7131 100644 --- a/ocaml/xenopsd/pvs/dune +++ b/ocaml/xenopsd/pvs/dune @@ -1,6 +1,6 @@ (executable (name pvs_proxy_setup) - (libraries ezxenstore.core bos xapi-consts.xapi_version xapi-idl cmdliner log rresult) + (libraries ezxenstore.core bos xapi-consts.xapi_version xapi-idl cmdliner log rresult unix) ) (install diff --git a/ocaml/xenopsd/suspend_image_viewer/dune b/ocaml/xenopsd/suspend_image_viewer/dune index 706b58bf3f3..e4d34573486 100644 --- a/ocaml/xenopsd/suspend_image_viewer/dune +++ b/ocaml/xenopsd/suspend_image_viewer/dune @@ -7,6 +7,7 @@ forkexec result uuid + unix xapi-consts.xapi_version xapi-idl xapi-log diff --git a/ocaml/xenopsd/test/dune b/ocaml/xenopsd/test/dune index 986000138af..4842184ea97 100644 --- a/ocaml/xenopsd/test/dune +++ b/ocaml/xenopsd/test/dune @@ -8,6 +8,7 @@ result rpclib.core rpclib.json + unix xapi-idl xapi-idl.xen.interface xapi-idl.xen.interface.types diff --git a/ocaml/xenopsd/xc/dune b/ocaml/xenopsd/xc/dune index 1bf73af404f..3432e818d15 100644 --- a/ocaml/xenopsd/xc/dune +++ b/ocaml/xenopsd/xc/dune @@ -32,6 +32,7 @@ sexplib0 qmp threads.posix + unix uri uuid uuidm @@ -73,7 +74,7 @@ (executable (name numa) (modules numa) - (libraries fmt logs logs.fmt mtime mtime.clock threads.posix xenctrl xenopsd_xc) + (libraries fmt logs logs.fmt mtime mtime.clock threads.posix xenctrl xenopsd_xc unix) ) (executable @@ -82,6 +83,7 @@ (modules xenops_xc_main) (libraries ezxenstore.core + unix uuid xapi-idl xapi-idl.xen.interface @@ -101,9 +103,9 @@ (libraries astring cmdliner - ezxenstore.core uuid + unix xapi-idl.memory clock xapi-stdext-unix diff --git a/ocaml/xs-trace/dune b/ocaml/xs-trace/dune index 4a19b8c888a..ab41958c1c0 100644 --- a/ocaml/xs-trace/dune +++ b/ocaml/xs-trace/dune @@ -3,7 +3,7 @@ (name xs_trace) (public_name xs-trace) (package xapi-tools) - (libraries uri tracing cmdliner tracing_export yojson xapi-stdext-unix zstd)) + (libraries uri tracing cmdliner tracing_export yojson xapi-stdext-unix zstd unix)) (rule (targets xs-trace.1) diff --git a/ocaml/xsh/dune b/ocaml/xsh/dune index c908cd4fdaa..41103081606 100644 --- a/ocaml/xsh/dune +++ b/ocaml/xsh/dune @@ -7,6 +7,7 @@ stunnel safe-resources + unix xapi-consts xapi-log xapi-stdext-unix From b74cda9dc52b1e56460b6e432d259634dccf0774 Mon Sep 17 00:00:00 2001 From: Rob Hoes Date: Wed, 24 Sep 2025 16:01:17 +0000 Subject: [PATCH 2/3] Fix test for OCaml 5 The format of the error that this test checks for is printed a little differently by the OCaml 5 compiler (the name of the tag is now quoted). Adapt the test a little to make it work both for OCaml 4 and 5. Signed-off-by: Rob Hoes --- .../libs/xapi-stdext/lib/xapi-fdcaps/test/properties.t | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/properties.t b/ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/properties.t index fa6792fc019..6d80e54050e 100644 --- a/ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/properties.t +++ b/ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/properties.t @@ -4,12 +4,14 @@ Check that we get compile errors when trying to use a read-only or write-only pr > open Xapi_fdcaps.Properties > let _ = as_readable (make `wronly `reg) > EOF - $ ocamlfind ocamlc -package xapi-stdext-unix.fdcaps -c t.ml 2>&1 | tail -n 1 - The second variant type does not allow tag(s) `wronly + $ ocamlfind ocamlc -package xapi-stdext-unix.fdcaps -c t.ml 2>&1 | + > grep -c "The second variant type does not allow tag(s)" + 1 $ cat >t.ml <<'EOF' > open Xapi_fdcaps.Properties > let _ = as_writable (make `rdonly `reg) > EOF - $ ocamlfind ocamlc -package xapi-stdext-unix.fdcaps -c t.ml 2>&1 | tail -n 1 - The second variant type does not allow tag(s) `rdonly + $ ocamlfind ocamlc -package xapi-stdext-unix.fdcaps -c t.ml 2>&1 | + > grep -c "The second variant type does not allow tag(s)" + 1 From 1c36d6bbc849711e261be1a6f25b9d309e29556f Mon Sep 17 00:00:00 2001 From: Rob Hoes Date: Mon, 29 Sep 2025 16:03:43 +0000 Subject: [PATCH 3/3] Remove unused Xenctrlext function Signed-off-by: Rob Hoes --- ocaml/xenopsd/c_stubs/xenctrlext_stubs.c | 29 ------------------------ ocaml/xenopsd/xc/xenctrlext.ml | 4 ---- ocaml/xenopsd/xc/xenctrlext.mli | 4 ---- 3 files changed, 37 deletions(-) diff --git a/ocaml/xenopsd/c_stubs/xenctrlext_stubs.c b/ocaml/xenopsd/c_stubs/xenctrlext_stubs.c index 4af5e60c8ec..a9d8f3f97bb 100644 --- a/ocaml/xenopsd/c_stubs/xenctrlext_stubs.c +++ b/ocaml/xenopsd/c_stubs/xenctrlext_stubs.c @@ -144,35 +144,6 @@ CAMLprim value stub_xenctrlext_get_runstate_info(value xch_val, value domid) #endif } -CAMLprim value stub_xenctrlext_get_boot_cpufeatures(value xch_val) -{ - CAMLparam1(xch_val); -#if defined(XENCTRL_HAS_GET_CPUFEATURES) - CAMLlocal1(v); - uint32_t a, b, c, d, e, f, g, h; - int ret; - xc_interface *xch = xch_of_val(xch_val); - - ret = xc_get_boot_cpufeatures(xch, &a, &b, &c, &d, &e, &f, &g, &h); - if (ret < 0) - failwith_xc(xch); - - v = caml_alloc_tuple(8); - Store_field(v, 0, caml_copy_int32(a)); - Store_field(v, 1, caml_copy_int32(b)); - Store_field(v, 2, caml_copy_int32(c)); - Store_field(v, 3, caml_copy_int32(d)); - Store_field(v, 4, caml_copy_int32(e)); - Store_field(v, 5, caml_copy_int32(f)); - Store_field(v, 6, caml_copy_int32(g)); - Store_field(v, 7, caml_copy_int32(h)); - - CAMLreturn(v); -#else - caml_failwith("XENCTRL_HAS_GET_CPUFEATURES not defined"); -#endif -} - static int xcext_domain_send_s3resume(xc_interface *xch, unsigned int domid) { return xc_set_hvm_param(xch, domid, HVM_PARAM_ACPI_S_STATE, 0); diff --git a/ocaml/xenopsd/xc/xenctrlext.ml b/ocaml/xenopsd/xc/xenctrlext.ml index 1c983daae26..f69b7dd9d9b 100644 --- a/ocaml/xenopsd/xc/xenctrlext.ml +++ b/ocaml/xenopsd/xc/xenctrlext.ml @@ -34,10 +34,6 @@ let get_handle () = handle := Some h ; h -external get_boot_cpufeatures : - handle -> int32 * int32 * int32 * int32 * int32 * int32 * int32 * int32 - = "stub_xenctrlext_get_boot_cpufeatures" - external domain_set_timer_mode : handle -> domid -> int -> unit = "stub_xenctrlext_domain_set_timer_mode" diff --git a/ocaml/xenopsd/xc/xenctrlext.mli b/ocaml/xenopsd/xc/xenctrlext.mli index 1572a1a8589..aa0d9d2e4ab 100644 --- a/ocaml/xenopsd/xc/xenctrlext.mli +++ b/ocaml/xenopsd/xc/xenctrlext.mli @@ -20,10 +20,6 @@ external interface_open : unit -> handle = "stub_xenctrlext_interface_open" val get_handle : unit -> handle -external get_boot_cpufeatures : - handle -> int32 * int32 * int32 * int32 * int32 * int32 * int32 * int32 - = "stub_xenctrlext_get_boot_cpufeatures" - external domain_set_timer_mode : handle -> domid -> int -> unit = "stub_xenctrlext_domain_set_timer_mode"