diff --git a/dune-project b/dune-project index 6eff709..794234f 100644 --- a/dune-project +++ b/dune-project @@ -27,6 +27,6 @@ (package (name oxenstored) (synopsis "Oxenstored") - (depends dune-site lwt lwt-dllist ounit2) + (depends dune-site ounit2) (sites (lib plugins))) diff --git a/oxenstored.opam b/oxenstored.opam index ded0f5d..998291a 100644 --- a/oxenstored.opam +++ b/oxenstored.opam @@ -9,8 +9,6 @@ bug-reports: "https://github.com/xapi-project/oxenstored/issues" depends: [ "dune" {>= "3.15"} "dune-site" - "lwt" - "lwt-dllist" "ounit2" "odoc" {with-doc} ] diff --git a/oxenstored/dune b/oxenstored/dune index fce8f9f..3b27070 100644 --- a/oxenstored/dune +++ b/oxenstored/dune @@ -5,7 +5,7 @@ (:standard \ syslog configure)) (flags (:standard -w -52)) - (libraries unix xenbus xen-evtchn xen-evtchn-unix + (libraries unix xenbus xen-evtchn xen-evtchn-unix-minimal xengnt xenmmap syslog xsdglue dune-site dune-site.plugins)) diff --git a/oxenstored/event.ml b/oxenstored/event.ml index a3c0447..c4b884e 100644 --- a/oxenstored/event.ml +++ b/oxenstored/event.ml @@ -40,7 +40,7 @@ let init ?fd ?domexc_port () = in {handle; domexc} -let fd eventchn = Unix_activations.fd eventchn.handle +let fd eventchn = Unix_activations_minimal.fd eventchn.handle let bind_interdomain eventchn domid port = Xeneventchn.bind_interdomain eventchn.handle domid port @@ -49,11 +49,11 @@ let unbind eventchn port = Xeneventchn.unbind eventchn.handle port let notify eventchn port = Xeneventchn.notify eventchn.handle port -let pending eventchn = Unix_activations.pending eventchn.handle +let pending eventchn = Unix_activations_minimal.pending eventchn.handle let unmask eventchn port = Xeneventchn.unmask eventchn.handle port let dump e chan = Printf.fprintf chan "evtchn-dev,%d,%d\n" - (Utils.FD.to_int @@ Unix_activations.fd e.handle) + (Utils.FD.to_int @@ Unix_activations_minimal.fd e.handle) (Xeneventchn.to_int e.domexc)