From: Tomasz Wroblewski <tomasz.wroblewski@citrix.com>
Date: Thu, 19 Nov 2009 10:55:03 +0000 (+0000)
Subject: Fixes for local watch event.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9c451ad3e489c64d0817722eb74ed3fc1e561a93;p=xenclient%2Ftoolstack.git

Fixes for local watch event.

So it does get sent only to VM in which the event occured, not all of them.
---

diff --git a/xenops/Makefile b/xenops/Makefile
index 58f1610..45edb14 100644
--- a/xenops/Makefile
+++ b/xenops/Makefile
@@ -11,9 +11,7 @@ OCAMLOPTFLAGS += -thread
 
 OBJS_XENOPS_COMMON = \
 	$(TOPLEVEL)/common/debug io memory netman table stats watch \
-	$(TOPLEVEL)/common/forkhelpers xenguestHelper xenbus xal \
-	balloon device_common hotplug device \
-	domain
+	$(TOPLEVEL)/common/forkhelpers xenguestHelper xenbus balloon device_common hotplug device domain xal
 
 all: $(LIBS)
 
diff --git a/xenops/xal.ml b/xenops/xal.ml
index e15efb0..2dfb40e 100644
--- a/xenops/xal.ml
+++ b/xenops/xal.ml
@@ -625,7 +625,8 @@ let domain_device_event ctx w v =
 	| Some (_, ExtraVm (uuid, node, value), _, _) ->
 		ctx.callback_devices ctx (-1) (Extra (uuid, node, value));
 	| Some (domid, ExtraLocal (node, value), _, _) ->
-		ctx.callback_devices ctx domid (Extra ("", node, value));
+	        let uuid = Uuid.string_of_uuid (Domain.get_uuid ctx.xc domid) in
+		ctx.callback_devices ctx domid (Extra (uuid, node, value));
 	| Some (_, Rtc (uuid, value), _, _) ->
 		ctx.callback_devices ctx (-1) (ChangeRtc (uuid, value))
 	| Some (_, IntMessage (uuid, name, priority, body), _, _) ->