Skip to content

libxl update work #12

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

Closed
mcclurmc wants to merge 8 commits into from
Closed

libxl update work #12

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bc54e54
Add config.mk and dist to .gitignore
Aug 1, 2013
9a2d9c2
Replace Xenctrl.get_uuid with Xenlight.Dominfo.get
Aug 1, 2013
0b94f7d
Replace more Xenctrl calls with existing Xenlight calls
Aug 2, 2013
8515ee1
attach_and_activate no longer needs xc
Aug 2, 2013
dea790c
Add TODO comments for remaining 'with_xc' calls
Aug 2, 2013
3c60a45
Remove more with_xc calls, and annotate the remaining work
Aug 2, 2013
31b66ff
Refactoring: remove separate Domain module (and some ws changes)
Aug 2, 2013
f9c4c8a
libxl: Added domain_death event handler
Aug 6, 2013
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
Prev Previous commit
Next Next commit
Replace more Xenctrl calls with existing Xenlight calls 
Signed-off-by: Mike McClurg <[email protected]>
  • Loading branch information
Mike McClurg committed Aug 2, 2013
commit 0b94f7d413e6c2c1a876cd883a20c5d0e37756d1
11 changes: 7 additions & 4 deletions xl/xenops_server_xenlight.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1471,8 +1471,9 @@ module VM = struct
let hvm = match vm.ty with HVM _ -> true | _ -> false in
(* XXX add per-vcpu information to the platform data *)
(* VCPU configuration *)
(* TODO replace get_max_nr_cpus with libxl_get_max_cpu (not yet in Xenlight!) *)
let pcpus = Xenctrlext.get_max_nr_cpus xc in
let pcpus = with_ctx (fun ctx ->
Xenlight.Physinfo.((get ctx).nr_cpus)) |> Int32.to_int in
(* let pcpus = Xenctrlext.get_max_nr_cpus xc in *)
let all_pcpus = pcpus |> Range.make 0 |> Range.to_list in
let all_vcpus = vm.vcpu_max |> Range.make 0 |> Range.to_list in
let masks = match vm.scheduler_params.affinity with
Expand Down Expand Up @@ -2655,7 +2656,8 @@ module DEBUG = struct
match di_of_uuid ~xs Newest uuid with
| None -> raise (Does_not_exist("domain", k))
| Some di ->
Xenctrl.domain_shutdown xc di.domid Xenctrl.Reboot
with_ctx (fun ctx -> Xenlight.Domain.reboot ctx di.domid)
(* Xenctrl.domain_shutdown xc di.domid Xenctrl.Reboot *)
)
| "halt", [ k ] ->
let uuid = uuid_of_string k in
Expand All @@ -2664,7 +2666,8 @@ module DEBUG = struct
match di_of_uuid ~xs Newest uuid with
| None -> raise (Does_not_exist("domain", k))
| Some di ->
Xenctrl.domain_shutdown xc di.domid Xenctrl.Halt
with_ctx (fun ctx -> Xenlight.Domain.shutdown ctx di.domid)
(* Xenctrl.domain_shutdown xc di.domid Xenctrl.Halt *)
)
| _ ->
debug "DEBUG.trigger cmd=%s Unimplemented" cmd;
Expand Down