Skip to content

CP-17469: Treat all known PCI classes as managed #2670

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
merged 3 commits into from
Jun 4, 2016
Merged

CP-17469: Treat all known PCI classes as managed #2670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d91561
CP-17469: Pciops: Remove unused unassign_all_for_vm
simonjbeaumont Jun 2, 2016
28fc0e4
CP-17469: Xapi_pci: Treat all known PCI classes as managed
simonjbeaumont Jun 2, 2016
99f1d52
CP-17469: Xapi_pci: Start managing storage controller PCI devices
simonjbeaumont Jun 2, 2016
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
5 changes: 0 additions & 5 deletions ocaml/xapi/pciops.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@ let get_free_functions ~__context pci =
let functions = Int64.to_int (Db.PCI.get_functions ~__context ~self:pci) in
functions - assignments

let unassign_all_for_vm ~__context vm =
(* Db.VM.set_attached_PCIs ~__context ~self:vm ~value:[] *)
let pcis = Db.VM.get_attached_PCIs ~__context ~self:vm in
List.iter (fun self -> Db.PCI.remove_attached_VMs ~__context ~self ~value:vm) pcis

(* http://wiki.xen.org/wiki/Bus:Device.Function_%28BDF%29_Notation *)
(* It might be possible to refactor this but attempts so far have failed. *)
let bdf_fmt = format_of_string "%04x:%02x:%02x.%01x"
Expand Down
3 changes: 0 additions & 3 deletions ocaml/xapi/pciops.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
(** Check if a given PCI device is free. *)
val get_free_functions : __context:Context.t -> [ `PCI ] Ref.t -> int

(** Mark all PCI devices for a given VM as unattached. *)
val unassign_all_for_vm : __context:Context.t -> [ `VM ] Ref.t -> unit

(** Return the PCI DBDF string for a PCI object *)
val pcidev_of_pci: __context:Context.t -> API.ref_PCI -> (int * int * int * int)

Expand Down
15 changes: 12 additions & 3 deletions ocaml/xapi/xapi_pci.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,25 @@ open D
open Listext
open Xstringext

type base_class = Display_controller | Network_controller
type base_class =
| Storage_controller
| Network_controller
| Display_controller

let is_class_of_kind kind id =
let base_class_id_of_kind = function
| Storage_controller -> 0x0100
| Network_controller -> 0x0200
| Display_controller -> 0x0300
| Network_controller -> 0x0200 in
in
(* The base_class is the most-significant byte of the class ID *)
id land 0xff00 = base_class_id_of_kind kind

let managed_classes = [Display_controller]
let managed_classes = [
Storage_controller;
Network_controller;
Display_controller;
]

let string_of_pci ~__context ~self =
let pci = Db.PCI.get_record_internal ~__context ~self in
Expand Down
5 changes: 4 additions & 1 deletion ocaml/xapi/xapi_pci.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
*)

(** Types of PCI devices. *)
type base_class = Display_controller | Network_controller
type base_class =
| Storage_controller
| Network_controller
| Display_controller

(* Check if an class ID is of a given base class *)
val is_class_of_kind : base_class -> int -> bool
Expand Down