Merge pull request #768 from psafont/private/paus/yang-ppx

Author: psafont

cli/xn.ml

@@ -788,6 +788,8 @@ let pp x =
                (List.map (fun (s, t) -> Line (s ^ ": ") :: to_t t) xs))
         ; Line "}"
         ]
+    | Base64 x ->
+        [Line x]
     | Null ->
         []
   in

configure

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-D=$(mktemp -d /tmp/configure.XXXXX)
+D=$(mktemp -d ${TMPDIR:-/tmp}/configure.XXXXX)
 function cleanup {
   cd /
   rm -rf $D

lib/xenopsd.ml

@@ -276,13 +276,15 @@ let rpc_fn call =
             name= "VM.import_metadata"
           ; params=
               [Rpc.Dict [("debug_info", debug_info); ("metadata", metadata)]]
+          ; notif= false
           }
     | "query", [debug_info; unit_p] ->
         debug "Upgrading query" ;
         Rpc.
           {
             name= "query"
           ; params= [Rpc.Dict [("debug_info", debug_info); ("unit", unit_p)]]
+          ; notif= false
           }
     | _ ->
         call

xc/device.ml

@@ -3290,8 +3290,8 @@ module Backend = struct
 
     (** File-descriptor event monitor implementation for the epoll library *)
     module Monitor = struct
-      module Epoll = Core.Linux_ext.Epoll
-      module Flags = Core.Linux_ext.Epoll.Flags
+      module Epoll = Linux_ext.Epoll
+      module Flags = Linux_ext.Epoll.Flags
 
       let num_file_descrs =
         match Core.Unix.RLimit.((get num_file_descriptors).cur) with

xc/dune

@@ -6,6 +6,7 @@
 
  (libraries
    astring
+   core.linux_ext
    xenctrl
    xapi-xenopsd
    xenstore