From f5e924d8ce750f049bb927bb0dd6de1274a6efea Mon Sep 17 00:00:00 2001 From: Jon Ludlam Date: Wed, 23 Nov 2016 13:36:14 +0000 Subject: [PATCH] Use ocaml-rpc v1.9.6 Signed-off-by: Jon Ludlam --- lib/channel_helper.ml | 2 +- lib/xcp_channel_protocol.mli | 5 ++--- xen/device_number.ml | 3 --- xen/device_number.mli | 2 -- xen/xenops_types.ml | 4 +--- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/lib/channel_helper.ml b/lib/channel_helper.ml index 58a5fda2..55ab02a7 100644 --- a/lib/channel_helper.ml +++ b/lib/channel_helper.ml @@ -46,7 +46,7 @@ module Common = struct let make verbose debug port = { verbose; debug; port } - let to_string x = Jsonrpc.to_string (rpc_of x) + let to_string x = Jsonrpc.to_string (rpc_of_t x) end let _common_options = "COMMON OPTIONS" diff --git a/lib/xcp_channel_protocol.mli b/lib/xcp_channel_protocol.mli index 7d993bf5..946f9a9c 100644 --- a/lib/xcp_channel_protocol.mli +++ b/lib/xcp_channel_protocol.mli @@ -17,6 +17,5 @@ type t = | V4V_proxy of int * int (** domid, port *) | Unix_sendmsg of int * string * string (** domid, path, token *) -val rpc_of: t -> Rpc.t -val of_rpc: Rpc.t -> t - +val rpc_of_t: t -> Rpc.t +val t_of_rpc: Rpc.t -> t diff --git a/xen/device_number.ml b/xen/device_number.ml index b5746b21..94c73969 100644 --- a/xen/device_number.ml +++ b/xen/device_number.ml @@ -9,9 +9,6 @@ type spec = bus_type * int * int [@@deriving rpc] type t = spec [@@deriving rpc] -let t_of_rpc = of_rpc -let rpc_of_t = rpc_of - let to_debug_string = function | (Xen, disk, partition) -> Printf.sprintf "Xen(%d, %d)" disk partition | (Scsi, disk, partition) -> Printf.sprintf "Scsi(%d, %d)" disk partition diff --git a/xen/device_number.mli b/xen/device_number.mli index 85b08e32..ee8b402a 100644 --- a/xen/device_number.mli +++ b/xen/device_number.mli @@ -12,8 +12,6 @@ type spec = bus_type * int * int (** A valid device number *) type t -val of_rpc: Rpc.t -> t -val rpc_of: t -> Rpc.t val t_of_rpc: Rpc.t -> t val rpc_of_t: t -> Rpc.t diff --git a/xen/xenops_types.ml b/xen/xenops_types.ml index f08a249e..15b55cb9 100644 --- a/xen/xenops_types.ml +++ b/xen/xenops_types.ml @@ -221,9 +221,7 @@ module Vm = struct pci_power_mgmt = false; has_vendor_device = false; } - let of_rpc rpc = Rpc.struct_extend rpc (rpc_of default_t) |> of_rpc - let t_of_rpc = of_rpc - let rpc_of_t = rpc_of + let t_of_rpc rpc = Rpc.struct_extend rpc (rpc_of_t default_t) |> t_of_rpc type console_protocol = | Rfb