Skip to content

Commit

Permalink
fix: evaluation wont fail when BalloonMemory is enabled
Browse files Browse the repository at this point in the history
When BalloonMemory was not 0 evaluation of derivations failed after
PR #324 made deflate-on-oom optional.
The new optional set containing the argument was only merged with the
other arguments, after those were converted into a list leading to a
type mismatch.

fixes: #326
  • Loading branch information
71rd authored and astro committed Jan 29, 2025
1 parent 3768f49 commit abab3cf
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions lib/runners/cloud-hypervisor.nix
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,14 @@ let
hugepages = "on";
});

balloonOps = opsMapped {
balloonOps = opsMapped ({
size = "${toString balloonMem}M";
free_page_reporting = "on";
} // lib.optionalAttrs deflateOnOOM {
}
# enable deflating memory balloon on out-of-memory
// lib.optionals deflateOnOOM {
deflate_on_oom = "on";
};
});

tapMultiQueue = vcpu > 1;

Expand Down

0 comments on commit abab3cf

Please sign in to comment.