Merge master into feature/perf

[edwintorok]

Fixed some conflicts in dune files, and added dependencies where needed (this branch has transitive-deps disabled). Also had to update old_record_util.ml due to the bugfix on master which caused the string returned for the shutdown enum to change from unknown to known.

[edwintorok]

Github doesn't provide a good UI for reviewing the merge commit itself, but I just learned this new CLI command which shows how merge conflicts got solved:

git log --remerge-diff 491c1994242420679a18ed3b86a00b4d19f0668c -1
commit 491c1994242420679a18ed3b86a00b4d19f0668c
Merge: 3d6151b403 ac9279b3f5
Author: Edwin Török <edwin.torok@cloud.com>
Date:   Tue Jun 25 17:14:38 2024 +0100

    Merge remote-tracking branch 'xsu/master' into feature/perf

diff --git a/ocaml/libs/vhd/vhd_format_lwt_test/dune b/ocaml/libs/vhd/vhd_format_lwt_test/dune
index c8ff604d92..d8ece64012 100644
--- a/ocaml/libs/vhd/vhd_format_lwt_test/dune
+++ b/ocaml/libs/vhd/vhd_format_lwt_test/dune
@@ -1,5 +1,5 @@
 (test
  (name parse_test)
  (package vhd-format-lwt)
- (libraries alcotest alcotest-lwt cstruct disk io-page lwt lwt.unix vhd-format
+ (libraries alcotest alcotest-lwt cstruct disk fmt io-page lwt lwt.unix vhd-format
    vhd_format_lwt))
diff --git a/ocaml/libs/xapi-stdext/lib/xapi-stdext-unix/dune b/ocaml/libs/xapi-stdext/lib/xapi-stdext-unix/dune
remerge CONFLICT (content): Merge conflict in ocaml/libs/xapi-stdext/lib/xapi-stdext-unix/dune
index b351efe297..92b77753a8 100644
--- a/ocaml/libs/xapi-stdext/lib/xapi-stdext-unix/dune
+++ b/ocaml/libs/xapi-stdext/lib/xapi-stdext-unix/dune
@@ -3,17 +3,14 @@
   (public_name xapi-stdext-unix)
   (libraries
     fd-send-recv
+    integers
     polly
     unix
     xapi-backtrace
-<<<<<<< 3d6151b403 (Merge pull request #5704 from edwintorok/private/edvint/epoll3.0-pr)
     threads.posix
-||||||| 130bbbef7f
-=======
     unix-errno
     unix-errno.unix
     astring
->>>>>>> ac9279b3f5 (Merge pull request #5725 from last-genius/private/asultanov/standalone-systemd)
     xapi-stdext-pervasives)
   (foreign_stubs
     (language c)
diff --git a/ocaml/libs/xapi-stdext/lib/xapi-stdext-unix/test/dune b/ocaml/libs/xapi-stdext/lib/xapi-stdext-unix/test/dune
remerge CONFLICT (add/add): Merge conflict in ocaml/libs/xapi-stdext/lib/xapi-stdext-unix/test/dune
index 1e070553f6..1e00c17bef 100644
--- a/ocaml/libs/xapi-stdext/lib/xapi-stdext-unix/test/dune
+++ b/ocaml/libs/xapi-stdext/lib/xapi-stdext-unix/test/dune
@@ -1,4 +1,3 @@
-<<<<<<< 3d6151b403 (Merge pull request #5704 from edwintorok/private/edvint/epoll3.0-pr)
 (test
   (name unixext_test)
   (modules unixext_test)
@@ -12,14 +11,13 @@
   ; use default random seed on stresstests
   (action (run %{dep:unixext_test.exe} -v -bt))
 )
-||||||| 130bbbef7f
-=======
+
 (executable
  (modes exe)
  (name test_systemd)
+ (modules test_systemd)
  (libraries xapi-stdext-unix))

 (cram
  (package xapi-stdext-unix)
  (deps test_systemd.exe))
->>>>>>> ac9279b3f5 (Merge pull request #5725 from last-genius/private/asultanov/standalone-systemd)
diff --git a/ocaml/libs/xapi-stdext/lib/xapi-stdext-unix/test/generate.mli b/ocaml/libs/xapi-stdext/lib/xapi-stdext-unix/test/generate.mli
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ocaml/tests/record_util/old_record_util.ml b/ocaml/tests/record_util/old_record_util.ml
index b8648bbafb..ad38fe7ea3 100644
--- a/ocaml/tests/record_util/old_record_util.ml
+++ b/ocaml/tests/record_util/old_record_util.ml
@@ -118,6 +118,7 @@ let vm_operation_table =
   ; (`changing_NVRAM, "changing_NVRAM")
   ; (`start, "start")
   ; (`start_on, "start_on")
+  ; (`shutdown, "shutdown")
   ; (`suspend, "suspend")
   ; (`unpause, "unpause")
   ; (`update_allowed_operations, "update_allowed_operations")
diff --git a/ocaml/xcp-rrdd/test/transport/dune b/ocaml/xcp-rrdd/test/transport/dune
index 0ba7d90e8e..333b4db49c 100644
--- a/ocaml/xcp-rrdd/test/transport/dune
+++ b/ocaml/xcp-rrdd/test/transport/dune
@@ -4,6 +4,7 @@
   (libraries
     alcotest
     dune-build-info
+    fmt
     rrd-transport
     xapi-idl.rrd
     xapi-rrd
diff --git a/ocaml/xe-cli/dune b/ocaml/xe-cli/dune
index 4bfba68c2d..f72cacbbda 100644
--- a/ocaml/xe-cli/dune
+++ b/ocaml/xe-cli/dune
@@ -11,6 +11,7 @@
     stunnel
     threads
     tracing
+    uri
     yojson
     xapi-backtrace
     xapi-cli-protocol

[edwintorok]

(:converting to draft, a unit test fails in Koji now, but passes locally)

[edwintorok]

Koji build fixed with https://github.com/xapi-project/xen-api/pull/5741/commits/547d762c56ecce3d22ca1706ef6b8a6ec422f905, I was missing the ulimit setting.