replace - by _ in method name when using dbus to transport RPC.

diff --git a/xenvm/xenvm.ml b/xenvm/xenvm.ml
index 989193cf580773ff7e32382a6f7a728aa8d7957c..abdc974a4de760eb9ea5ab5ecca4466247e9a770 100644 (file)
--- a/xenvm/xenvm.ml
+++ b/xenvm/xenvm.ml
@@ -690,6 +690,7 @@ let monitor_rpc_dbus state =
        let process_method_call msg =
                let params = DBus.Message.get msg in
                let msg_method = match DBus.Message.get_member msg with None -> "missingmethod" | Some m -> m in
+               let msg_method = String.replace "_" "-" msg_method in
                match params with
                | [ DBus.Array DBus.Dicts ((_, _), msg_params) ] ->
                        let params = List.map (fun (k, v) ->

diff --git a/xenvm/xenvmlib.ml b/xenvm/xenvmlib.ml
index 0942da7f8d3d740007c89fd2aaf70305405cb8e4..be2f0e6d2bf02858ec40cb1de4884f3bfbf91f8a 100644 (file)
--- a/xenvm/xenvmlib.ml
+++ b/xenvm/xenvmlib.ml
@@ -173,6 +173,7 @@ let request ?timeout id query =
        let dest = intf in
 
        let method_name, params = query in
+       let method_name = String.replace "-" "_" method_name in
        let msg = DBus.Message.new_method_call dest "/" intf method_name in
        let params = List.map (fun (k, v) -> DBus.String k, DBus.String v) params in
        DBus.Message.append msg [ DBus.Array (DBus.Dicts ((DBus.SigString, DBus.SigString), params)) ];