@@ -625,6 +625,7 @@ let shutdown_wait_for_ack (t : Xenops_task.task_handle) ~timeout ~xc ~xs domid
625
625
(domain_type : [`pv | `pvh | `hvm] ) req =
626
626
let di = Xenctrl. domain_getinfo xc domid in
627
627
let uuid = get_uuid ~xc domid in
628
+ let uuid = Uuidx. to_string uuid in
628
629
let expecting_ack =
629
630
match (di.Xenctrl. hvm_guest, domain_type) with
630
631
| false , _ ->
@@ -640,12 +641,12 @@ let shutdown_wait_for_ack (t : Xenops_task.task_handle) ~timeout ~xc ~xs domid
640
641
debug
641
642
" VM = %s; domid = %d; HVM guest without PV drivers: not expecting any \
642
643
acknowledgement"
643
- ( Uuidx. to_string uuid) domid ;
644
+ uuid domid ;
644
645
Xenctrl. domain_shutdown xc domid (shutdown_to_xc_shutdown req)
645
646
) else (
646
647
debug
647
648
" VM = %s; domid = %d; Waiting for domain to acknowledge shutdown request"
648
- ( Uuidx. to_string uuid) domid ;
649
+ uuid domid ;
649
650
let path = control_shutdown ~xs domid in
650
651
let cancel = Domain domid in
651
652
if
@@ -654,11 +655,10 @@ let shutdown_wait_for_ack (t : Xenops_task.task_handle) ~timeout ~xc ~xs domid
654
655
[Watch. key_to_disappear path]
655
656
t ~xs ~timeout ()
656
657
then
657
- info " VM = %s; domid = %d; Domain acknowledged shutdown request"
658
- (Uuidx. to_string uuid) domid
659
- else
660
- debug " VM = %s; domid = %d; Domain disappeared" (Uuidx. to_string uuid)
658
+ info " VM = %s; domid = %d; Domain acknowledged shutdown request" uuid
661
659
domid
660
+ else
661
+ debug " VM = %s; domid = %d; Domain disappeared" uuid domid
662
662
)
663
663
664
664
let sysrq ~xs domid key =
0 commit comments