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
13 changes: 6 additions & 7 deletions ocaml/xenopsd/xc/domain.ml
Original file line number Diff line number Diff line change
Expand Up @@ -942,20 +942,19 @@ let numa_placement domid ~vcpus ~memory affinity =
let ( let* ) = Option.bind in
let xcext = get_handle () in
let* host = Lazy.force numa_hierarchy in
let numa_meminfo = (numainfo xcext).memory |> Array.to_list in
let numa_meminfo = (numainfo xcext).memory |> Array.to_seq in
let nodes =
ListLabels.map2
(NUMA.nodes host |> List.of_seq)
numa_meminfo
~f:(fun node m -> NUMA.resource host node ~memory:m.memfree)
Seq.map2
(fun node m -> NUMA.resource host node ~memory:m.memfree)
(NUMA.nodes host) numa_meminfo
in
let vm = NUMARequest.make ~memory ~vcpus in
let nodea =
match !numa_resources with
| None ->
Array.of_list nodes
Array.of_seq nodes
| Some a ->
Array.map2 NUMAResource.min_memory (Array.of_list nodes) a
Array.map2 NUMAResource.min_memory (Array.of_seq nodes) a
in
numa_resources := Some nodea ;
let memory_plan =
Expand Down
Loading