Limit vnc console sync with master

[stephenchengCloud]

No description provided.

[BengangY]

Need to make format first.

[minglumlu]

 +  | "pool", "vm_console_idle_timeout" ->
-       Some "25.30.0-next"
++      Some "25.35.0"
 +  | "pool", "limit_console_sessions" ->
-       Some "25.30.0-next"
++      Some "25.35.0"

I think they should be 25.35.0-next

[minglumlu]

$ git show 84ae4d12cb
commit 84ae4d12cbbdabecb1dbd118ac80b706ba106bde (HEAD -> limit_vnc_console_sync_with_master, stephenchengCloud/limit_vnc_console_sync_with_master)
Merge: 01444d2e76 a3cbb5de0c
Author: Stephen Cheng <stephen.cheng@citrix.com>
Date:   Thu Oct 30 09:57:45 2025 +0800

    Merge branch 'master' into limit_vnc_console_sync_with_master

    Fix conflicts

    Signed-off-by: Stephen Cheng <stephen.cheng@citrix.com>

diff --cc ocaml/idl/datamodel_lifecycle.ml
index 87aae103c5,a98e52d1dd..cc2d7fe80c
--- a/ocaml/idl/datamodel_lifecycle.ml
+++ b/ocaml/idl/datamodel_lifecycle.ml
@@@ -137,10 -139,6 +139,10 @@@ let prototyped_of_field = functio
        Some "23.18.0"
    | "VM", "actions__after_softreboot" ->
        Some "23.1.0"
 +  | "pool", "vm_console_idle_timeout" ->
-       Some "25.30.0-next"
++      Some "25.35.0-next"
 +  | "pool", "limit_console_sessions" ->
-       Some "25.30.0-next"
++      Some "25.35.0-next"
    | "pool", "ha_reboot_vm_on_internal_shutdown" ->
        Some "25.16.0"
    | "pool", "license_server" ->
diff --cc ocaml/idl/schematest.ml
index 4e54c8efae,9411d1c3b4..7dc03c97ba
--- 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 = "dcb73e162d2189e13c5d308181520f04"
 -let last_known_schema_hash = "3b20f4304cfaaa7b6213af91ae632e64"
++let last_known_schema_hash = "9e085767a7a70fb84747776c4d6cc663"

  let current_schema_hash : string =
    let open Datamodel_types in
 -let last_known_schema_hash = "3b20f4304cfaaa7b6213af91ae632e64"
++let last_known_schema_hash = "9e085767a7a70fb84747776c4d6cc663"

  let current_schema_hash : string =
    let open Datamodel_types in
diff --cc ocaml/tests/suite_alcotest.ml
index 18211da76b,9c776b375c..5cbd192e9a
--- a/ocaml/tests/suite_alcotest.ml
+++ b/ocaml/tests/suite_alcotest.ml
@@@ -70,5 -70,5 +70,6 @@@ let ()
      @ Test_session.tests
      @ Test_xapi_cmd_result.tests
      @ Test_extauth_plugin_ADwinbind.tests
 +    @ Test_rfb_client_msgtype_parser.tests
+     @ Test_tracked_user_agents.tests
      )
diff --cc ocaml/xapi/xapi_globs.ml
index f84d72149d,fcbc9174e9..e3acff8ce2
--- a/ocaml/xapi/xapi_globs.ml
+++ b/ocaml/xapi/xapi_globs.ml
@@@ -1788,14 -1826,39 +1831,47 @@@ let other_options
      , (fun () -> string_of_float !vm_sysprep_wait)
      , "Time in seconds to wait for VM to recognise inserted CD"
      )
 +  ; ( "proxy_poll_period_timeout"
 +    , Arg.Set_float proxy_poll_period_timeout
 +    , (fun () -> string_of_float !proxy_poll_period_timeout)
 +    , "Timeout (in seconds) for event polling in network proxy loops. When \
 +       positive, the proxy will wake up periodically to check tasks like vnc \
 +       idle timeouts or perform other maintenance tasks. Set to -1 to wait \
 +       indefinitely for network events without periodic wake-ups."
 +    )
+   ; ( "max-span-depth"
+     , Arg.Set_int max_span_depth
+     , (fun () -> string_of_int !max_span_depth)
+     , "The maximum depth to which spans are recorded in a trace in Tracing"
+     )
+   ; ( "firewall-backend"
+     , Arg.String
+         (fun s ->
+           firewall_backend :=
+             match s with
+             | "firewalld" ->
+                 Firewalld
+             | "iptables" ->
+                 Iptables
+             | _ ->
+                 D.error "Unknown firewall backend: %s" s ;
+                 failwith "Unknown firewall backend"
+         )
+     , (fun () ->
+         match !firewall_backend with
+         | Firewalld ->
+             "firewalld"
+         | Iptables ->
+             "iptables"
+       )
+     , "Firewall backend. iptables (in XS 8) or firewalld (in XS 9 or later XS \
+        version)"
+     )
+   ; ( "dynamic-control-firewalld-service"
+     , Arg.Bool (fun b -> dynamic_control_firewalld_service := b)
+     , (fun () -> string_of_bool !dynamic_control_firewalld_service)
+     , "Enable dynamic control firewalld service"
+     )
    ]

  (* The options can be set with the variable xapiflags in /etc/sysconfig/xapi.