Merge pull request xapi-project#5091 from robhoes/1.249-lcm

CP-43468: push CPUID logic down from xapi into xenopsd
xcp-ng · Jul 6, 2023 · 1594d0d · 1594d0d
2 parents 4cfd326 + 96efe4f
commit 1594d0d
Show file tree

Hide file tree

Showing 7 changed files with 102 additions and 1,169 deletions.
diff --git a/ocaml/tests/suite_alcotest.ml b/ocaml/tests/suite_alcotest.ml
@@ -73,8 +73,6 @@ let () =
        ; Test_pgpu_helpers.tests
        ; Test_storage_migrate_state.tests
        ; Test_vm.tests
-       ; Test_cpuid_helpers.tests
-       ; Test_pool_cpuinfo.tests
        ; Test_dbsync_master.tests
        ; Test_pvs_cache_storage.tests
        ; Test_extauth_plugin_ADpbis.tests

diff --git a/ocaml/tests/test_common.ml b/ocaml/tests/test_common.ml
@@ -58,6 +58,8 @@ let default_cpu_info =
   ; ("features_hvm_host", "")
   ]
 
+let cpu_policy_of_string = Xenops_interface.CPU_policy.of_string `host
+
 let make_localhost ~__context ?(features = Features.all_features) () =
   let host_info =
     {
@@ -86,11 +88,11 @@ let make_localhost ~__context ?(features = Features.all_features) () =
           ; model= ""
           ; stepping= ""
           ; flags= ""
-          ; features= [||]
-          ; features_pv= [||]
-          ; features_hvm= [||]
-          ; features_pv_host= [||]
-          ; features_hvm_host= [||]
+          ; features= cpu_policy_of_string ""
+          ; features_pv= cpu_policy_of_string ""
+          ; features_hvm= cpu_policy_of_string ""
+          ; features_pv_host= cpu_policy_of_string ""
+          ; features_hvm_host= cpu_policy_of_string ""
           }
     ; hypervisor= None
     ; chipset_info= None