Skip to content

Commit

Permalink
Remove the server logic and add the interdomain transport
Browse files Browse the repository at this point in the history
The server logic should live somewhere else (ideally in xen-unstable).
The interdomain (kernelspace) transport is needed by Mirage guests.

Signed-off-by: David Scott <dave.scott@citrix.com>
  • Loading branch information
David Scott committed Jul 6, 2014
1 parent 1e3570c commit e9a2069
Show file tree
Hide file tree
Showing 36 changed files with 560 additions and 2,996 deletions.
5 changes: 5 additions & 0 deletions README.md
Expand Up @@ -47,3 +47,8 @@ Client.(wait (
| status, _ when status <> "" -> return (`Ok status)
| _, error -> return (`Error error)
))
Open issues
-----------
1. Xenstore.Client.Make is a nice name. Global 'Userspace' and 'Kernelspace' are a bit rude. Can these be made part of the Xenstore.* space somehow, even through they are optional?
8 changes: 8 additions & 0 deletions _oasis
Expand Up @@ -37,6 +37,14 @@ Library xenstore_userspace
Modules: Userspace
BuildDepends: lwt, lwt.unix, xenstore

Library xenstore_kernelspace
CompiledObject: best
Path: kernelspace
Findlibname: kernelspace
FindlibParent: xenstore
Modules: Kernelspace
BuildDepends: lwt, lwt.unix, xenstore, io-page, xen-evtchn

Executable xs
CompiledObject: best
Path: xs
Expand Down
16 changes: 15 additions & 1 deletion _tags
@@ -1,5 +1,5 @@
# OASIS_START
# DO NOT EDIT (digest: e6fa89f152aaf0989390a7b5f1f39a18)
# DO NOT EDIT (digest: c6f1e48aef04fee58f7cd90e6bc7b4c3)
# Ignore VCS directories, you can use the same kind of rule outside
# OASIS_START/STOP if you want to exclude directories that contains
# useless stuff for the build process
Expand Down Expand Up @@ -66,6 +66,20 @@
<core_test/*.ml{,i}>: use_xenstore
<core_test/*.ml{,i}>: use_xenstore_userspace
<core_test/core_test.{native,byte}>: custom
# Library xenstore_kernelspace
"kernelspace/xenstore_kernelspace.cmxs": use_xenstore_kernelspace
<kernelspace/*.ml{,i}>: pkg_cstruct
<kernelspace/*.ml{,i}>: pkg_cstruct.syntax
<kernelspace/*.ml{,i}>: pkg_io-page
<kernelspace/*.ml{,i}>: pkg_lwt
<kernelspace/*.ml{,i}>: pkg_lwt.syntax
<kernelspace/*.ml{,i}>: pkg_lwt.unix
<kernelspace/*.ml{,i}>: pkg_sexplib
<kernelspace/*.ml{,i}>: pkg_sexplib.syntax
<kernelspace/*.ml{,i}>: pkg_stringext
<kernelspace/*.ml{,i}>: pkg_uri
<kernelspace/*.ml{,i}>: pkg_xen-evtchn
<kernelspace/*.ml{,i}>: use_xenstore
# Executable xs
<xs/xs.{native,byte}>: pkg_cmdliner
<xs/xs.{native,byte}>: pkg_cstruct
Expand Down
13 changes: 12 additions & 1 deletion core/META
@@ -1,5 +1,5 @@
# OASIS_START
# DO NOT EDIT (digest: b37b6d5fa02f4dc76104cc0076c75f95)
# DO NOT EDIT (digest: ce903430f09a616bf584fbe62ac2de6e)
version = "1.2.5"
description = "Xenstore protocol library"
requires =
Expand All @@ -19,5 +19,16 @@ package "userspace" (
archive(native, plugin) = "xenstore_userspace.cmxs"
exists_if = "xenstore_userspace.cma"
)

package "kernelspace" (
version = "1.2.5"
description = "Xenstore protocol library"
requires = "lwt lwt.unix xenstore io-page xen-evtchn"
archive(byte) = "xenstore_kernelspace.cma"
archive(byte, plugin) = "xenstore_kernelspace.cma"
archive(native) = "xenstore_kernelspace.cmxa"
archive(native, plugin) = "xenstore_kernelspace.cmxs"
exists_if = "xenstore_kernelspace.cma"
)
# OASIS_STOP

0 comments on commit e9a2069

Please sign in to comment.