Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ocaml/xapi/xapi_vm_lifecycle.ml
Original file line number Diff line number Diff line change
Expand Up @@ -856,8 +856,6 @@ let force_state_reset_keep_current_operations ~__context ~self ~value:state =
if state = `Suspended then
remove_pending_guidance ~__context ~self ~value:`restart_device_model ;
if state = `Halted then (
remove_pending_guidance ~__context ~self ~value:`restart_device_model ;
remove_pending_guidance ~__context ~self ~value:`restart_vm ;
(* mark all devices as disconnected *)
List.iter
(fun vbd ->
Expand Down Expand Up @@ -899,7 +897,9 @@ let force_state_reset_keep_current_operations ~__context ~self ~value:state =
)
(Db.VM.get_VUSBs ~__context ~self) ;
(* Blank the requires_reboot flag *)
Db.VM.set_requires_reboot ~__context ~self ~value:false
Db.VM.set_requires_reboot ~__context ~self ~value:false ;
remove_pending_guidance ~__context ~self ~value:`restart_device_model ;
remove_pending_guidance ~__context ~self ~value:`restart_vm
) ;
(* Do not clear resident_on for VM and VGPU in a checkpoint operation *)
if
Expand Down
Loading