xapi-project · robhoes · Sep 30, 2025 · Sep 29, 2025 · Sep 24, 2025 · Sep 29, 2025
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -7,5 +7,6 @@
     xenctrl
     uuidm
     threads.posix
+    unix
    )
 )
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -7,5 +7,6 @@
     logs
     logs.fmt
     alcotest
+    unix
   )
 )
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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-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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -13,6 +13,7 @@
     message-switch-core
     message-switch-lwt
     uri
+    unix
   )
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,7 @@ @@
         xapi-stdext-std
         xapi-stdext-pervasives
         xapi-stdext-unix
+        unix
       )
     )
@@ Expand Down @@