Merge pull request xapi-project#11 from jonludlam/stdext-pack

Use packed stdext

Author: Jon Ludlam

ChangeLog

@@ -1,3 +1,6 @@
+1.0.1 (23-Jun-2016):
+* Use stdext 2.0.0
+
 1.0.0 (27-Apr-2016):
 * Don't use oasis to install binaries
 * Rename /xapi/* to /xenops/* in Xenstore

Makefile

@@ -6,6 +6,9 @@ J=4
 
 export OCAMLRUNPARAM=b
 
+setup.ml: _oasis
+	@oasis setup
+
 setup.bin: setup.ml
 	@ocamlopt.opt -o $@ $< || ocamlopt -o $@ $< || ocamlc -o $@ $<
 	@rm -f setup.cmx setup.cmi setup.o setup.cmo

_oasis

@@ -1,6 +1,6 @@
 OASISFormat: 0.3
 Name:        xenops
-Version:     1.0.0
+Version:     1.0.1
 Synopsis:    Various Xen operations
 Authors:     Vincent Hanquez, Dave Scott, Jon Ludlam
 License:     LGPL-2.1 with OCaml linking exception

_tags

@@ -11,7 +11,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  *)
-open Pervasiveext
 
 let domid = ref None
 let minimal = ref false
@@ -54,6 +53,8 @@ let hashtbl_of_domaininfo x : (string, string) Hashtbl.t =
   let shadow_mib =
     try Some (Int64.of_int (Xenctrl.shadow_allocation_get xc_handle x.domid))
     with _ -> None in
+  let open Stdext.Pervasiveext in
+  let open Stdext in
   let shadow_bytes = may Memory.bytes_of_mib shadow_mib in
   let shadow_pages = may Memory.pages_of_mib shadow_mib in
   Hashtbl.add table "shadow bytes" (Opt.default "N/A" (may Int64.to_string shadow_bytes));