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 58f16106924b2d98b65c6bf3ca1e4431bad3c75e..45edb14660bc7c551fd55d71ac0da68ebe9e6499 100644 (file)
--- 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 e15efb0b5268db6c2758c9e135e36acdc78808bf..2dfb40e59c19489b034f7d35137cba35453485c6 100644 (file)
--- 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), _, _) ->