xapi-project / xen-api / 16413440854

push

github

Sync master to feature/configure-ssh-phase3 (#6598)

Merge master to feature branch and resolve the following conflicts:


```ocaml
$ git show <a class=hub.com/xapi-project/xen-api/commit/db5ad7d472aebb4ab5d89d4a85371db8ad989ccd">db5ad7d47
commit db5ad7d472aebb4ab5d89d4a85371db8ad989ccd (HEAD -> private/luzhan/sync-master-to-feature, mygithub/private/luzhan/sync-master-to-feature)
Merge: d34d581e7 c185101d6
Author: Lunfan Zhang[Lunfan.Zhang] <Lunfan.Zhang@cloud.com>
Date:   Mon Jul 21 08:50:26 2025 +0000

    Merge master to feature branch

diff --cc ocaml/idl/schematest.ml
index d3914f478,7bd70cb3a..963231d7d
--- a/ocaml/idl/schematest.ml
+++ b/ocaml/idl/schematest.ml
@@@ -3,7 -3,7 +3,7 @@@ let hash x = Digest.string x |> Digest.
  (* BEWARE: if this changes, check that schema has been bumped accordingly in
     ocaml/idl/datamodel_common.ml, usually schema_minor_vsn *)
  
- let last_known_schema_hash = "a030fa0233a69a33200b628af0f030c7"
 -let last_known_schema_hash = "9cd32d98d092440c36617546a3d995bd"
++let last_known_schema_hash = "7586cb039918e573594fc358e90b0f04"
  
  let current_schema_hash : string =
    let open Datamodel_types in
diff --cc ocaml/xapi/xapi_globs.ml
index 14459e1c8,7bdd07079..ba08ad113
--- a/ocaml/xapi/xapi_globs.ml
+++ b/ocaml/xapi/xapi_globs.ml
@@@ -1757,12 -1758,16 +1762,22 @@@ let other_options 
      , (fun () -> string_of_bool !validate_reusable_pool_session)
      , "Enable validation of reusable pool sessions before use"
      )
 +  ; ( "ssh-auto-mode"
 +    , Arg.Bool (fun b -> ssh_auto_mode_default := b)
 +    , (fun () -> string_of_bool !ssh_auto_mode_default)
 +    , "Defaults to true; overridden to false via \
 +       /etc/xapi.conf.d/ssh-auto-mode.conf(e.g., in XenServer 8)"
 +    )
+   ; ( "vm-sysprep-enabled"
+     , Arg.Set vm_sysprep_enabled
+     , (fun () -> string_of_bool !vm_sysprep_enabled)
+     , "Enable VM.sysprep API"
+     )
+   ; ( "vm-sysprep-wait"
+     , Arg.Set_float vm_sysprep_wait
+     , (fun () -> string_of_float !vm_sysprep_wait)
+     , "Time ... (continued)

126 of 147 new or added lines in 4 files covered. (85.71%)

3491 of 4345 relevant lines covered (80.35%)

0.8 hits per line