Skip to content

CA-48488: improve syntax of VM.other_config:pci #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1 commit merged into from
Feb 10, 2011
Merged

CA-48488: improve syntax of VM.other_config:pci #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 5 additions & 7 deletions ocaml/xapi/vmops.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,16 +136,14 @@ let create_vifs ~__context ~xs vifs =
raise (Api_errors.Server_error (Api_errors.cannot_plug_vif, [ Ref.string_of vif.Vm_config.vif_ref ]))
) vifs

(* Confusion: the n/xxxx:xx:xx.x syntax originally meant PCI device
xxxx:xx:xx.x should be plugged into bus number n. HVM guests don't have
multiple PCI buses anyway. We reinterpret the 'n' to be a hotplug ordering *)
let sort_pcidevs devs =
let ids = ref [] in
List.iter (fun (id, _) ->
if not (List.mem id !ids) then
ids := id :: !ids
) devs;

let ids = List.sort compare (Listext.List.setify (List.map fst devs)) in
List.map (fun id ->
id, (List.map snd (List.filter (fun (x, _) -> x = id) devs))
) !ids
) ids

let attach_pcis ~__context ~xc ~xs ~hvm domid pcis =
Helpers.log_exn_continue "attach_pcis"
Expand Down