more debug info

Author: edwintorok

ocaml/xenopsd/xc/domain.ml

@@ -1029,6 +1029,11 @@ let numa_placement domid ~vcpus ~cores ~memory affinity =
 let build_pre ~xc ~xs ~vcpus ~memory ~hard_affinity domid =
   let open Memory in
   let uuid = get_uuid ~xc domid in
+  debug "VM = %s, build_max_mib = %Ld, build_start_mib = %Ld, xen_max_mib =
+    %Ld, shadow_mib = %Ld, required_host_free_mib = %Ld, overhead_mib = %Ld"
+    (Uuidx.to_string uuid)
+    memory.build_max_mib memory.build_start_mib memory.xen_max_mib
+    memory.shadow_mib memory.required_host_free_mib memory.overhead_mib;
   debug "VM = %s; domid = %d; waiting for %Ld MiB of free host memory"
     (Uuidx.to_string uuid) domid memory.required_host_free_mib ;
   (* CA-39743: Wait, if necessary, for the Xen scrubber to catch up. *)

ocaml/xenopsd/xc/xenops_server_xen.ml

@@ -1830,6 +1830,7 @@ module VM = struct
               let dbg = Xenops_task.get_dbg task in
               Mem.with_reservation dbg min_kib max_kib
                 (fun target_plus_overhead_kib reservation_id ->
+                  debug "VM = %s, memory [%Ld KiB, %Ld KiB], target_plus_overhead=%Ld KiB" vm.Vm.id min_kib max_kib target_plus_overhead_kib;
                   let domain_config, persistent =
                     match persistent.VmExtra.domain_config with
                     | Some dc ->
@@ -1870,6 +1871,7 @@ module VM = struct
                     let target_bytes =
                       target_plus_overhead_bytes --- overhead_bytes
                     in
+                    debug "VM = %s, memory target_bytes = %Ld, dynamic max = %Ld" vm.Vm.id target_bytes vm.memory_dynamic_max;
                     min vm.memory_dynamic_max target_bytes
                   in
                   set_initial_target ~xs domid (Int64.div initial_target 1024L) ;
@@ -2967,6 +2969,7 @@ module VM = struct
               | _ ->
                   ""
             in
+            debug "VM = %s, initial_target = %Ld" vm.Vm.id initial_target;
             ({x with Domain.memory_target= initial_target}, timeoffset)
       in
       let vtpm = vtpm_of ~vm in
@@ -3106,7 +3109,9 @@ module VM = struct
             let memory_actual =
               let pages = Int64.of_nativeint di.Xenctrl.total_memory_pages in
               let kib = Xenctrl.pages_to_kib pages in
-              Memory.bytes_of_kib kib
+              let bytes = Memory.bytes_of_kib kib in
+              D.debug "VM %s memory actual: %Ld pages = %Ld KiB = %Ld bytes" (Uuidm.to_string uuid) pages kib bytes;
+              bytes
             in
             let memory_limit =
               (* The maximum amount of memory the domain can consume is the max
@@ -3129,7 +3134,9 @@ module VM = struct
               in
               (* CA-31764: may be larger than static_max if maxmem has been
                  increased to initial-reservation. *)
-              max memory_actual max_memory_bytes
+              let result = max memory_actual max_memory_bytes in
+              D.debug "VM %s memory limit = %Ld bytes" (Uuidm.to_string uuid) result;
+              result
             in
             let rtc =
               try