fixup! CP-34028: Replace Uuidm with Uuid wherever possible

xapi-project · Apr 13, 2022 · 39013d6 · 39013d6
1 parent 87358e7
commit 39013d6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/ocaml/xenopsd/xc/domain.ml b/ocaml/xenopsd/xc/domain.ml
@@ -214,13 +214,19 @@ let rec xenstore_iter t fn path =
         names
 
 let get_uuid ~xc domid =
+  let string_of_domain_handle handle =
+    Array.to_list handle |> List.map string_of_int |> String.concat "; "
+  in
   let raw_uuid = (Xenctrl.domain_getinfo xc domid).Xenctrl.handle in
   match Uuid.of_int_array raw_uuid with
   | Some x ->
       x
   | None ->
       failwith
-        (Printf.sprintf "VM handle for domain %i is an invalid uuid" domid)
+        (Printf.sprintf "VM handle for domain %i is an invalid uuid: %a" domid
+           (fun () -> string_of_domain_handle)
+           raw_uuid
+        )
 
 let wait_xen_free_mem ~xc ?(maximum_wait_time_seconds = 64) required_memory_kib
     : bool =

diff --git a/ocaml/xenopsd/xc/xenops_server_xen.ml b/ocaml/xenopsd/xc/xenops_server_xen.ml
@@ -4989,13 +4989,18 @@ module Actions = struct
         List.iter (remove_device_watch xs) old_devices
     in
     let uuid_of_domain di =
+      let string_of_domain_handle handle =
+        Array.to_list handle |> List.map string_of_int |> String.concat "; "
+      in
       match Uuid.of_int_array di.Xenctrl.handle with
       | Some x ->
           x
       | None ->
           failwith
-            (Printf.sprintf "VM handle for domain %i is an invalid uuid"
+            (Printf.sprintf "VM handle for domain %i is an invalid uuid: %a"
                di.Xenctrl.domid
+               (fun () -> string_of_domain_handle)
+               di.Xenctrl.handle
             )
     in
     let fire_event_on_vm domid =