Use PPXs where possible

Signed-off-by: Jon Ludlam <jonathan.ludlam@citrix.com>

Author: jonludlam

_oasis

@@ -13,15 +13,15 @@ Library xcp
   Findlibname:        xcp
   Modules:            Cohttp_posix_io, Posix_channel, Open_uri, Xcp_client, Xcp_service, Xcp_channel, Xcp_channel_protocol, Syslog, Debug
   CSources:           syslog_stubs.c
-  BuildDepends:       cmdliner, uri, re, cohttp, xmlm, unix, sexplib, sexplib.syntax, rpclib, rpclib.syntax, rpclib.xml, threads, message_switch (>= 0.11.0), message_switch.unix, fd-send-recv, xcp-inventory, xapi-backtrace
+  BuildDepends:       cmdliner, uri, re, cohttp, xmlm, unix, ppx_sexp_conv, sexplib, ppx_deriving_rpc, rpclib, rpclib.xml, threads, message_switch (>= 0.11.0), message_switch.unix, fd-send-recv, xcp-inventory, xapi-backtrace
 
 Library xcp_storage
   CompiledObject:     best
   Path:               storage
   Findlibname:        storage
   Findlibparent:      xcp
   Modules:            Storage_interface, Vdi_automaton, Storage_client, Storage_skeleton, Storage_skeleton_test
-  BuildDepends:       xcp, threads, rpclib, rpclib.syntax
+  BuildDepends:       xcp, threads, rpclib
 
 Executable storage_test
   CompiledObject:     best
@@ -36,39 +36,39 @@ Library xcp_network
   Findlibname:        network
   Findlibparent:      xcp
   Modules:            Network_interface, Network_client, Network_stats
-  BuildDepends:       xcp, threads, rpclib, rpclib.syntax
+  BuildDepends:       xcp, threads, rpclib
 
 Library xcp_rrd
   CompiledObject:     best
   Path:               rrd
   Findlibname:        rrd
   Findlibparent:      xcp
   Modules:            Data_source, Ds, Rrd_interface, Rrd_client
-  BuildDepends:       xcp, threads, rpclib, rpclib.syntax, rrd
+  BuildDepends:       xcp, threads, rpclib, rrd
 
 Library xcp_xen
   CompiledObject:     best
   Path:               xen
   Findlibname:        xen
   Findlibparent:      xcp
   Modules:            Xenops_interface, Xenops_types, Xenops_client, Device_number
-  BuildDepends:       xcp, threads, rpclib, rpclib.syntax
+  BuildDepends:       xcp, threads, ppx_deriving_rpc, rpclib
 
 Library xcp_memory
   CompiledObject:     best
   Path:               memory
   Findlibname:        memory
   Findlibparent:      xcp
   Modules:            Memory_interface, Memory_client
-  BuildDepends:       xcp, threads, rpclib, rpclib.syntax
+  BuildDepends:       xcp, threads, rpclib
 
 Library xapi_v6
   CompiledObject:     best
   Path:               v6
   Findlibname:        v6
   Findlibparent:      xcp
   Modules:            V6_interface, V6_client
-  BuildDepends:       xcp, threads, rpclib, rpclib.syntax
+  BuildDepends:       xcp, threads, rpclib
 
 Executable channel_helper
   CompiledObject:     best

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 2a0befa551f398e32c56a759b1351c69)
+# DO NOT EDIT (digest: 84bd6ed57b3561ce9ac6edd2793b3d1b)
 # 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
@@ -22,12 +22,12 @@ true: annot, bin_annot
 "lib/syslog_stubs.c": pkg_fd-send-recv
 "lib/syslog_stubs.c": pkg_message_switch
 "lib/syslog_stubs.c": pkg_message_switch.unix
+"lib/syslog_stubs.c": pkg_ppx_deriving_rpc
+"lib/syslog_stubs.c": pkg_ppx_sexp_conv
 "lib/syslog_stubs.c": pkg_re
 "lib/syslog_stubs.c": pkg_rpclib
-"lib/syslog_stubs.c": pkg_rpclib.syntax
 "lib/syslog_stubs.c": pkg_rpclib.xml
 "lib/syslog_stubs.c": pkg_sexplib
-"lib/syslog_stubs.c": pkg_sexplib.syntax
 "lib/syslog_stubs.c": pkg_threads
 "lib/syslog_stubs.c": pkg_unix
 "lib/syslog_stubs.c": pkg_uri
@@ -43,12 +43,12 @@ true: annot, bin_annot
 <storage/storage_test.{native,byte}>: pkg_message_switch
 <storage/storage_test.{native,byte}>: pkg_message_switch.unix
 <storage/storage_test.{native,byte}>: pkg_oUnit
+<storage/storage_test.{native,byte}>: pkg_ppx_deriving_rpc
+<storage/storage_test.{native,byte}>: pkg_ppx_sexp_conv
 <storage/storage_test.{native,byte}>: pkg_re
 <storage/storage_test.{native,byte}>: pkg_rpclib
-<storage/storage_test.{native,byte}>: pkg_rpclib.syntax
 <storage/storage_test.{native,byte}>: pkg_rpclib.xml
 <storage/storage_test.{native,byte}>: pkg_sexplib
-<storage/storage_test.{native,byte}>: pkg_sexplib.syntax
 <storage/storage_test.{native,byte}>: pkg_threads
 <storage/storage_test.{native,byte}>: pkg_unix
 <storage/storage_test.{native,byte}>: pkg_uri
@@ -63,12 +63,12 @@ true: annot, bin_annot
 <storage/*.ml{,i,y}>: pkg_message_switch
 <storage/*.ml{,i,y}>: pkg_message_switch.unix
 <storage/*.ml{,i,y}>: pkg_oUnit
+<storage/*.ml{,i,y}>: pkg_ppx_deriving_rpc
+<storage/*.ml{,i,y}>: pkg_ppx_sexp_conv
 <storage/*.ml{,i,y}>: pkg_re
 <storage/*.ml{,i,y}>: pkg_rpclib
-<storage/*.ml{,i,y}>: pkg_rpclib.syntax
 <storage/*.ml{,i,y}>: pkg_rpclib.xml
 <storage/*.ml{,i,y}>: pkg_sexplib
-<storage/*.ml{,i,y}>: pkg_sexplib.syntax
 <storage/*.ml{,i,y}>: pkg_threads
 <storage/*.ml{,i,y}>: pkg_unix
 <storage/*.ml{,i,y}>: pkg_uri
@@ -84,12 +84,12 @@ true: annot, bin_annot
 <network/*.ml{,i,y}>: pkg_fd-send-recv
 <network/*.ml{,i,y}>: pkg_message_switch
 <network/*.ml{,i,y}>: pkg_message_switch.unix
+<network/*.ml{,i,y}>: pkg_ppx_deriving_rpc
+<network/*.ml{,i,y}>: pkg_ppx_sexp_conv
 <network/*.ml{,i,y}>: pkg_re
 <network/*.ml{,i,y}>: pkg_rpclib
-<network/*.ml{,i,y}>: pkg_rpclib.syntax
 <network/*.ml{,i,y}>: pkg_rpclib.xml
 <network/*.ml{,i,y}>: pkg_sexplib
-<network/*.ml{,i,y}>: pkg_sexplib.syntax
 <network/*.ml{,i,y}>: pkg_threads
 <network/*.ml{,i,y}>: pkg_unix
 <network/*.ml{,i,y}>: pkg_uri
@@ -104,13 +104,13 @@ true: annot, bin_annot
 <rrd/*.ml{,i,y}>: pkg_fd-send-recv
 <rrd/*.ml{,i,y}>: pkg_message_switch
 <rrd/*.ml{,i,y}>: pkg_message_switch.unix
+<rrd/*.ml{,i,y}>: pkg_ppx_deriving_rpc
+<rrd/*.ml{,i,y}>: pkg_ppx_sexp_conv
 <rrd/*.ml{,i,y}>: pkg_re
 <rrd/*.ml{,i,y}>: pkg_rpclib
-<rrd/*.ml{,i,y}>: pkg_rpclib.syntax
 <rrd/*.ml{,i,y}>: pkg_rpclib.xml
 <rrd/*.ml{,i,y}>: pkg_rrd
 <rrd/*.ml{,i,y}>: pkg_sexplib
-<rrd/*.ml{,i,y}>: pkg_sexplib.syntax
 <rrd/*.ml{,i,y}>: pkg_threads
 <rrd/*.ml{,i,y}>: pkg_unix
 <rrd/*.ml{,i,y}>: pkg_uri
@@ -125,12 +125,12 @@ true: annot, bin_annot
 <xen/*.ml{,i,y}>: pkg_fd-send-recv
 <xen/*.ml{,i,y}>: pkg_message_switch
 <xen/*.ml{,i,y}>: pkg_message_switch.unix
+<xen/*.ml{,i,y}>: pkg_ppx_deriving_rpc
+<xen/*.ml{,i,y}>: pkg_ppx_sexp_conv
 <xen/*.ml{,i,y}>: pkg_re
 <xen/*.ml{,i,y}>: pkg_rpclib
-<xen/*.ml{,i,y}>: pkg_rpclib.syntax
 <xen/*.ml{,i,y}>: pkg_rpclib.xml
 <xen/*.ml{,i,y}>: pkg_sexplib
-<xen/*.ml{,i,y}>: pkg_sexplib.syntax
 <xen/*.ml{,i,y}>: pkg_threads
 <xen/*.ml{,i,y}>: pkg_unix
 <xen/*.ml{,i,y}>: pkg_uri
@@ -145,12 +145,12 @@ true: annot, bin_annot
 <memory/*.ml{,i,y}>: pkg_fd-send-recv
 <memory/*.ml{,i,y}>: pkg_message_switch
 <memory/*.ml{,i,y}>: pkg_message_switch.unix
+<memory/*.ml{,i,y}>: pkg_ppx_deriving_rpc
+<memory/*.ml{,i,y}>: pkg_ppx_sexp_conv
 <memory/*.ml{,i,y}>: pkg_re
 <memory/*.ml{,i,y}>: pkg_rpclib
-<memory/*.ml{,i,y}>: pkg_rpclib.syntax
 <memory/*.ml{,i,y}>: pkg_rpclib.xml
 <memory/*.ml{,i,y}>: pkg_sexplib
-<memory/*.ml{,i,y}>: pkg_sexplib.syntax
 <memory/*.ml{,i,y}>: pkg_threads
 <memory/*.ml{,i,y}>: pkg_unix
 <memory/*.ml{,i,y}>: pkg_uri
@@ -165,12 +165,12 @@ true: annot, bin_annot
 <v6/*.ml{,i,y}>: pkg_fd-send-recv
 <v6/*.ml{,i,y}>: pkg_message_switch
 <v6/*.ml{,i,y}>: pkg_message_switch.unix
+<v6/*.ml{,i,y}>: pkg_ppx_deriving_rpc
+<v6/*.ml{,i,y}>: pkg_ppx_sexp_conv
 <v6/*.ml{,i,y}>: pkg_re
 <v6/*.ml{,i,y}>: pkg_rpclib
-<v6/*.ml{,i,y}>: pkg_rpclib.syntax
 <v6/*.ml{,i,y}>: pkg_rpclib.xml
 <v6/*.ml{,i,y}>: pkg_sexplib
-<v6/*.ml{,i,y}>: pkg_sexplib.syntax
 <v6/*.ml{,i,y}>: pkg_threads
 <v6/*.ml{,i,y}>: pkg_unix
 <v6/*.ml{,i,y}>: pkg_uri
@@ -186,12 +186,12 @@ true: annot, bin_annot
 <lib/channel_helper.{native,byte}>: pkg_lwt.unix
 <lib/channel_helper.{native,byte}>: pkg_message_switch
 <lib/channel_helper.{native,byte}>: pkg_message_switch.unix
+<lib/channel_helper.{native,byte}>: pkg_ppx_deriving_rpc
+<lib/channel_helper.{native,byte}>: pkg_ppx_sexp_conv
 <lib/channel_helper.{native,byte}>: pkg_re
 <lib/channel_helper.{native,byte}>: pkg_rpclib
-<lib/channel_helper.{native,byte}>: pkg_rpclib.syntax
 <lib/channel_helper.{native,byte}>: pkg_rpclib.xml
 <lib/channel_helper.{native,byte}>: pkg_sexplib
-<lib/channel_helper.{native,byte}>: pkg_sexplib.syntax
 <lib/channel_helper.{native,byte}>: pkg_threads
 <lib/channel_helper.{native,byte}>: pkg_unix
 <lib/channel_helper.{native,byte}>: pkg_uri
@@ -206,12 +206,12 @@ true: annot, bin_annot
 <lib/*.ml{,i,y}>: pkg_lwt.unix
 <lib/*.ml{,i,y}>: pkg_message_switch
 <lib/*.ml{,i,y}>: pkg_message_switch.unix
+<lib/*.ml{,i,y}>: pkg_ppx_deriving_rpc
+<lib/*.ml{,i,y}>: pkg_ppx_sexp_conv
 <lib/*.ml{,i,y}>: pkg_re
 <lib/*.ml{,i,y}>: pkg_rpclib
-<lib/*.ml{,i,y}>: pkg_rpclib.syntax
 <lib/*.ml{,i,y}>: pkg_rpclib.xml
 <lib/*.ml{,i,y}>: pkg_sexplib
-<lib/*.ml{,i,y}>: pkg_sexplib.syntax
 <lib/*.ml{,i,y}>: pkg_threads
 <lib/*.ml{,i,y}>: pkg_unix
 <lib/*.ml{,i,y}>: pkg_uri
@@ -229,12 +229,12 @@ true: annot, bin_annot
 <lib_test/test.{native,byte}>: pkg_message_switch
 <lib_test/test.{native,byte}>: pkg_message_switch.unix
 <lib_test/test.{native,byte}>: pkg_oUnit
+<lib_test/test.{native,byte}>: pkg_ppx_deriving_rpc
+<lib_test/test.{native,byte}>: pkg_ppx_sexp_conv
 <lib_test/test.{native,byte}>: pkg_re
 <lib_test/test.{native,byte}>: pkg_rpclib
-<lib_test/test.{native,byte}>: pkg_rpclib.syntax
 <lib_test/test.{native,byte}>: pkg_rpclib.xml
 <lib_test/test.{native,byte}>: pkg_sexplib
-<lib_test/test.{native,byte}>: pkg_sexplib.syntax
 <lib_test/test.{native,byte}>: pkg_threads
 <lib_test/test.{native,byte}>: pkg_unix
 <lib_test/test.{native,byte}>: pkg_uri
@@ -251,12 +251,12 @@ true: annot, bin_annot
 <lib_test/*.ml{,i,y}>: pkg_message_switch
 <lib_test/*.ml{,i,y}>: pkg_message_switch.unix
 <lib_test/*.ml{,i,y}>: pkg_oUnit
+<lib_test/*.ml{,i,y}>: pkg_ppx_deriving_rpc
+<lib_test/*.ml{,i,y}>: pkg_ppx_sexp_conv
 <lib_test/*.ml{,i,y}>: pkg_re
 <lib_test/*.ml{,i,y}>: pkg_rpclib
-<lib_test/*.ml{,i,y}>: pkg_rpclib.syntax
 <lib_test/*.ml{,i,y}>: pkg_rpclib.xml
 <lib_test/*.ml{,i,y}>: pkg_sexplib
-<lib_test/*.ml{,i,y}>: pkg_sexplib.syntax
 <lib_test/*.ml{,i,y}>: pkg_threads
 <lib_test/*.ml{,i,y}>: pkg_unix
 <lib_test/*.ml{,i,y}>: pkg_uri
@@ -274,12 +274,12 @@ true: annot, bin_annot
 <example/example.{native,byte}>: pkg_lwt.unix
 <example/example.{native,byte}>: pkg_message_switch
 <example/example.{native,byte}>: pkg_message_switch.unix
+<example/example.{native,byte}>: pkg_ppx_deriving_rpc
+<example/example.{native,byte}>: pkg_ppx_sexp_conv
 <example/example.{native,byte}>: pkg_re
 <example/example.{native,byte}>: pkg_rpclib
-<example/example.{native,byte}>: pkg_rpclib.syntax
 <example/example.{native,byte}>: pkg_rpclib.xml
 <example/example.{native,byte}>: pkg_sexplib
-<example/example.{native,byte}>: pkg_sexplib.syntax
 <example/example.{native,byte}>: pkg_threads
 <example/example.{native,byte}>: pkg_unix
 <example/example.{native,byte}>: pkg_uri
@@ -294,12 +294,12 @@ true: annot, bin_annot
 <example/*.ml{,i,y}>: pkg_lwt.unix
 <example/*.ml{,i,y}>: pkg_message_switch
 <example/*.ml{,i,y}>: pkg_message_switch.unix
+<example/*.ml{,i,y}>: pkg_ppx_deriving_rpc
+<example/*.ml{,i,y}>: pkg_ppx_sexp_conv
 <example/*.ml{,i,y}>: pkg_re
 <example/*.ml{,i,y}>: pkg_rpclib
-<example/*.ml{,i,y}>: pkg_rpclib.syntax
 <example/*.ml{,i,y}>: pkg_rpclib.xml
 <example/*.ml{,i,y}>: pkg_sexplib
-<example/*.ml{,i,y}>: pkg_sexplib.syntax
 <example/*.ml{,i,y}>: pkg_threads
 <example/*.ml{,i,y}>: pkg_unix
 <example/*.ml{,i,y}>: pkg_uri
@@ -309,18 +309,17 @@ true: annot, bin_annot
 <example/*.ml{,i,y}>: use_xcp
 <example/example.{native,byte}>: custom
 # OASIS_STOP
-<storage/*.ml{,i}>: syntax_camlp4o
-<xen/*.ml{,i}>: syntax_camlp4o
-<memory/*.ml{,i}>: syntax_camlp4o
-<network/*.ml{,i}>: syntax_camlp4o
-<rrd/*.ml{,i}>: syntax_camlp4o
-<lib/*.ml>: syntax_camlp4o
+<storage/storage_interface.ml{,i}>: syntax_camlp4o
+<xen/xenops_interface.ml{,i}>: syntax_camlp4o
+<memory/memory_interface.ml{,i}>: syntax_camlp4o
+<network/network_interface.ml{,i}>: syntax_camlp4o
+<rrd/rrd_interface.ml{,i}>: syntax_camlp4o
+<v6/v6_interface.ml>: syntax_camlp4o
 <storage/storage_interface.ml>: pkg_rpclib.idl
 <xen/xenops_interface.ml>: pkg_rpclib.idl
 <memory/memory_interface.ml>: pkg_rpclib.idl
 <network/network_interface.ml>: pkg_rpclib.idl
 <rrd/data_source.ml>: pkg_rpclib.idl
 <rrd/rrd_interface.ml>: pkg_rpclib.idl
 <v6/v6_interface.ml>: pkg_rpclib.idl
-<lib/xcp_channel.ml>: pkg_rpclib.syntax
-<lib/channel_helper.ml>: pkg_lwt.syntax
+<lib/xcp_channel_protocol.ml>: pkg_ppx_deriving_rpc

lib/META

@@ -1,10 +1,10 @@
 # OASIS_START
-# DO NOT EDIT (digest: 4c2fff058ec9d19d5bacfab9163ebe98)
+# DO NOT EDIT (digest: d61b4e5a5c0d213787a9ffd3db8cee24)
 version = "1.2.0"
 description =
 "Interface definitions and common boilerplate for the xapi toolstack"
 requires =
-"cmdliner uri re cohttp xmlm unix sexplib sexplib.syntax rpclib rpclib.syntax rpclib.xml threads message_switch message_switch.unix fd-send-recv xcp-inventory xapi-backtrace"
+"cmdliner uri re cohttp xmlm unix ppx_sexp_conv sexplib ppx_deriving_rpc rpclib rpclib.xml threads message_switch message_switch.unix fd-send-recv xcp-inventory xapi-backtrace"
 archive(byte) = "xcp.cma"
 archive(byte, plugin) = "xcp.cma"
 archive(native) = "xcp.cmxa"
@@ -14,7 +14,7 @@ package "xen" (
  version = "1.2.0"
  description =
  "Interface definitions and common boilerplate for the xapi toolstack"
- requires = "xcp threads rpclib rpclib.syntax"
+ requires = "xcp threads ppx_deriving_rpc rpclib"
  archive(byte) = "xcp_xen.cma"
  archive(byte, plugin) = "xcp_xen.cma"
  archive(native) = "xcp_xen.cmxa"
@@ -26,7 +26,7 @@ package "v6" (
  version = "1.2.0"
  description =
  "Interface definitions and common boilerplate for the xapi toolstack"
- requires = "xcp threads rpclib rpclib.syntax"
+ requires = "xcp threads rpclib"
  archive(byte) = "xapi_v6.cma"
  archive(byte, plugin) = "xapi_v6.cma"
  archive(native) = "xapi_v6.cmxa"
@@ -38,7 +38,7 @@ package "storage" (
  version = "1.2.0"
  description =
  "Interface definitions and common boilerplate for the xapi toolstack"
- requires = "xcp threads rpclib rpclib.syntax"
+ requires = "xcp threads rpclib"
  archive(byte) = "xcp_storage.cma"
  archive(byte, plugin) = "xcp_storage.cma"
  archive(native) = "xcp_storage.cmxa"
@@ -50,7 +50,7 @@ package "rrd" (
  version = "1.2.0"
  description =
  "Interface definitions and common boilerplate for the xapi toolstack"
- requires = "xcp threads rpclib rpclib.syntax rrd"
+ requires = "xcp threads rpclib rrd"
  archive(byte) = "xcp_rrd.cma"
  archive(byte, plugin) = "xcp_rrd.cma"
  archive(native) = "xcp_rrd.cmxa"
@@ -62,7 +62,7 @@ package "network" (
  version = "1.2.0"
  description =
  "Interface definitions and common boilerplate for the xapi toolstack"
- requires = "xcp threads rpclib rpclib.syntax"
+ requires = "xcp threads rpclib"
  archive(byte) = "xcp_network.cma"
  archive(byte, plugin) = "xcp_network.cma"
  archive(native) = "xcp_network.cmxa"
@@ -74,7 +74,7 @@ package "memory" (
  version = "1.2.0"
  description =
  "Interface definitions and common boilerplate for the xapi toolstack"
- requires = "xcp threads rpclib rpclib.syntax"
+ requires = "xcp threads rpclib"
  archive(byte) = "xcp_memory.cma"
  archive(byte, plugin) = "xcp_memory.cma"
  archive(native) = "xcp_memory.cmxa"

lib/channel_helper.ml

@@ -41,7 +41,7 @@ module Common = struct
     verbose: bool;
     debug: bool;
     port: int;
-  } with rpc
+  } [@@deriving rpc]
 
   let make verbose debug port =
     { verbose; debug; port }

lib/xcp_channel.ml

@@ -3,7 +3,7 @@ type t = Unix.file_descr
 let file_descr_of_t t = t
 let t_of_file_descr t = t
 
-type protocols = Xcp_channel_protocol.t list with rpc
+type protocols = Xcp_channel_protocol.t list [@@deriving rpc]
 
 let rpc_of_t fd =
   let protocols = Posix_channel.send fd in

lib/xcp_channel_protocol.ml

@@ -16,6 +16,6 @@ type t =
   | TCP_proxy of string * int             (** IP, port *)
   | V4V_proxy of int * int                (** domid, port *)
   | Unix_sendmsg of int * string * string (** domid, path, token *)
-with rpc
+[@@deriving rpc]