Skip to content

Commit 4e2ef11

Browse files
authored
xenops: Fix migrate parameter ordering (#6823)
localhost_migration was introduced as the last parameter for migrate in xenops_interface.ml, but was second to last in xenops_server.ml. This meant that non-localhost migrations with verify_dest=true were classed as localhost and did not balloon down before migration. Fixes: 0911604 ("xenopsd: Don't balloon down memory on same-host migration")
2 parents ab236cf + 72c1491 commit 4e2ef11

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

ocaml/xenopsd/lib/xenops_server.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3842,7 +3842,7 @@ module VM = struct
38423842
let s3resume _ dbg id = queue_operation dbg id (Atomic (VM_s3resume id))
38433843

38443844
let migrate _context dbg id vmm_vdi_map vmm_vif_map vmm_vgpu_pci_map vmm_url
3845-
(compress : bool) (localhost_migration : bool) (verify_dest : bool) =
3845+
(compress : bool) (verify_dest : bool) (localhost_migration : bool) =
38463846
let tmp_uuid_of uuid ~kind =
38473847
Printf.sprintf "%s00000000000%c" (String.sub uuid 0 24)
38483848
(match kind with `dest -> '1' | `src -> '0')

0 commit comments

Comments
 (0)