From: Vincent Hanquez <vincent.hanquez@eu.citrix.com>
Date: Mon, 17 Aug 2009 09:50:54 +0000 (+0100)
Subject: take the method name from the message itself, not from its argument
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b05e5ba2c5f2c7e399cabd0df648103873180f57;p=xenclient%2Ftoolstack.git

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

diff --git a/xenvm/xenvm.ml b/xenvm/xenvm.ml
index 81a45d3..d912e31 100644
--- 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