CA-371529 expunge create_from_record_without_checking_licence ...

Remove the function and use VM.create_from_record directly. Signed-off-by: Christian Lindig <[email protected]>
xapi-project · Apr 30, 2024 · ebb58a8 · ebb58a8
1 parent 53dcbc0
commit ebb58a8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 25 deletions.
diff --git a/ocaml/xapi/import.ml b/ocaml/xapi/import.ml
@@ -629,17 +629,15 @@ module VM : HandlerTools = struct
               ~domain_type:vm_record.API.vM_domain_type
               ~is_a_template:vm_record.API.vM_is_a_template
               vm_record.API.vM_platform
+        ; API.vM_suspend_VDI= Ref.null
+        ; API.vM_power_state= `Halted
         }
       in
       let vm =
         log_reraise
           ("failed to create VM with name-label " ^ vm_record.API.vM_name_label)
           (fun value ->
-            let vm =
-              Xapi_vm_helpers
-              .create_from_record_without_checking_licence_feature_for_vendor_device
-                ~__context rpc session_id value
-            in
+            let vm = Client.VM.create_from_record ~rpc ~session_id ~value in
             if config.full_restore then
               Db.VM.set_uuid ~__context ~self:vm ~value:value.API.vM_uuid ;
             vm

diff --git a/ocaml/xapi/xapi_vm_helpers.ml b/ocaml/xapi/xapi_vm_helpers.ml
@@ -149,23 +149,6 @@ let update_vm_virtual_hardware_platform_version ~__context ~vm =
     Db.VM.set_hardware_platform_version ~__context ~self:vm
       ~value:visibly_required_version
 
-let create_from_record_without_checking_licence_feature_for_vendor_device
-    ~__context rpc session_id vm_record =
-  (* vendor device is no longer licensed *)
-  let mk_vm r =
-    Client.Client.VM.create_from_record ~rpc ~session_id
-      ~value:{r with API.vM_suspend_VDI= Ref.null; API.vM_power_state= `Halted}
-  in
-  let has_vendor_device = vm_record.API.vM_has_vendor_device in
-  if has_vendor_device then (
-    (* Avoid the licence feature check which is enforced in VM.create (and create_from_record). *)
-    let vm = mk_vm {vm_record with API.vM_has_vendor_device= false} in
-    Db.VM.set_has_vendor_device ~__context ~self:vm ~value:true ;
-    update_vm_virtual_hardware_platform_version ~__context ~vm ;
-    vm
-  ) else
-    mk_vm vm_record
-
 let destroy ~__context ~self =
   (* Used to be a call to hard shutdown here, but this will be redundant *)
   (* given the call to 'assert_operation_valid' *)

diff --git a/ocaml/xapi/xapi_vm_snapshot.ml b/ocaml/xapi/xapi_vm_snapshot.ml
@@ -553,11 +553,16 @@ let create_vm_from_snapshot ~__context ~snapshot =
     let snap_metadata = Helpers.vm_string_to_assoc snap_metadata in
     let vm_uuid = List.assoc Db_names.uuid snap_metadata in
     let snap_record = Db.VM.get_record ~__context ~self:snapshot in
+    let snap_record =
+      {
+        snap_record with
+        API.vM_suspend_VDI= Ref.null
+      ; API.vM_power_state= `Halted
+      }
+    in
     Helpers.call_api_functions ~__context (fun rpc session_id ->
         let new_vm =
-          Xapi_vm_helpers
-          .create_from_record_without_checking_licence_feature_for_vendor_device
-            ~__context rpc session_id snap_record
+          Client.VM.create_from_record ~rpc ~session_id ~value:snap_record
         in
         try
           Db.VM.set_uuid ~__context ~self:new_vm ~value:vm_uuid ;