Skip to content

Fixes to build against Solo5 targets #181

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

Fixes to build against Solo5 targets #181

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
5e874a4
Update gitignore for ukvm target
mato Sep 1, 2016
7dcb9e0
Use Key.is_unix instead of Key.is_xen
mato Sep 1, 2016
eaf4394
io_page example needs an explicit dependency
mato Sep 7, 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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@ mir-*
make-fat*-image.sh
*_gen.ml
*_gen.ml.in
**/_build-ukvm/
**/Makefile.ukvm
**/ukvm-bin
4 changes: 2 additions & 2 deletions conduit_server/config.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ let direct =
(* Only add the Unix socket backend if the configuration mode is Unix *)
let socket =
let c = default_console in
if_impl Key.is_xen
noop
if_impl Key.is_unix
(handler $ c $ conduit_direct (socket_stackv4 [Ipaddr.V4.any]))
noop

let () =
register "conduit_server" [direct ; socket ]
4 changes: 2 additions & 2 deletions conduit_server_manual/config.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ let direct =
(* Only add the Unix socket backend if the configuration mode is Unix *)
let socket =
let c = default_console in
if_impl Key.is_xen
noop
if_impl Key.is_unix
(handler $ default_time $ c $ socket_stackv4 [Ipaddr.V4.any])
noop

let () =
register "conduit_server" [direct ; socket]
2 changes: 1 addition & 1 deletion io_page/config.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ open Mirage

let main =
foreign
~libraries:["duration"] ~packages:["duration"]
~libraries:["duration"; "io-page"] ~packages:["duration"; "io-page"]
"Unikernel.Main" (time @-> console @-> job)

let () = register "io_page" [
Expand Down