Skip to content
Open
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
19 changes: 9 additions & 10 deletions ocaml/squeezed/src/squeeze_xen.ml
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,8 @@ let make_host ~verbose ~xc =
(fun domain ->
let domid = domain.Squeeze.domid
and target_kib = domain.Squeeze.target_kib in
if target_kib < Domain.get_maxmem xc domid then
if target_kib < Domain.get_maxmem xc domid && domain.Squeeze.can_balloon
then
Domain.set_maxmem_noexn xc domid target_kib
)
domains ;
Expand Down Expand Up @@ -828,16 +829,14 @@ let execute_action ~xc action =
"Not setting target for domid: %d since no feature-balloon. Setting \
maxmem to %Ld"
domid target_kib
) else (
if can_balloon then
Domain.set_target_noexn cnx domid target_kib
else
debug
"Not setting target for domid: %d since no feature-balloon. Setting \
maxmem to %Ld"
domid target_kib ;
) else if can_balloon then begin
Domain.set_target_noexn cnx domid target_kib ;
Domain.set_maxmem_noexn cnx domid target_kib
)
end else
debug
"Not setting target for domid: %d since no feature-balloon. Not \
setting maxmem to %Ld"
domid target_kib
with e ->
debug "Failed to reset balloon target (domid: %d) (target: %Ld): %s"
action.Squeeze.action_domid action.Squeeze.new_target_kib
Expand Down
Loading