take the method name from the message itself, not from its argument

diff --git a/xenvm/xenvm.ml b/xenvm/xenvm.ml
index 81a45d3a2e1f34fdb51b0a350de27aea9ca14fda..d912e311b05a18f7801120386375ee75d348453e 100644 (file)
--- a/xenvm/xenvm.ml
+++ b/xenvm/xenvm.ml
@@ -150,7 +150,7 @@ let check_vm uuid =
                info "VM is already handled by another xenvm";
                exit 1;
        );
-       let path = Xenvmlib.path_of_socket uuid in
+       let path = Xenvmlib.Socket.path_of_socket uuid in
        if Sys.file_exists path then (
                info "stale socket left by previous xenvm. removing";
                Unixext.unlink_safe path
@@ -691,8 +691,9 @@ let monitor_rpc_dbus state =
 
        let process_message msg =
                let params = DBus.Message.get msg in
+               let msg_method = match DBus.Message.get_member msg with None -> assert false | Some m -> m in
                match params with
-               | [ DBus.String msg_method; DBus.Array DBus.Dicts ((_, _), msg_params) ] ->
+               | [ DBus.Array DBus.Dicts ((_, _), msg_params) ] ->
                        let params = List.map (fun (k, v) ->
                                match k, v with
                                | DBus.String key, DBus.String value -> key, value