aboutsummaryrefslogtreecommitdiffstats
path: root/tools/libxl/libxl.c
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2012-10-18 09:35:09 +0100
committerIan Campbell <ian.campbell@citrix.com>2012-10-18 09:35:09 +0100
commitb3b123b5a943cd2e289c6cb429836f6b16648771 (patch)
tree292d5282b3a330887a69287562cfe0824c806e23 /tools/libxl/libxl.c
parent191e485a1929a02706ec3301f3185b2b89c3253f (diff)
downloadxen-b3b123b5a943cd2e289c6cb429836f6b16648771.tar.gz
xen-b3b123b5a943cd2e289c6cb429836f6b16648771.tar.bz2
xen-b3b123b5a943cd2e289c6cb429836f6b16648771.zip
libxl: propagate user supplied values into event for_user field.
This was ommited in the majority of cases. Add as a parameter to libxl__event_new and the NEW_EVENT wrapper to help prevent it being forgotten in the future. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'tools/libxl/libxl.c')
-rw-r--r--tools/libxl/libxl.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 3366ccfc66..665385b318 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -955,7 +955,7 @@ static void domain_death_occurred(libxl__egc *egc,
libxl_evgen_domain_death *evg_next = LIBXL_TAILQ_NEXT(evg, entry);
*evg_upd = evg_next;
- libxl_event *ev = NEW_EVENT(egc, DOMAIN_DEATH, evg->domid);
+ libxl_event *ev = NEW_EVENT(egc, DOMAIN_DEATH, evg->domid, evg->user);
libxl__event_occurred(egc, ev);
@@ -1041,8 +1041,9 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w,
if (!evg->shutdown_reported &&
(got->flags & XEN_DOMINF_shutdown)) {
- libxl_event *ev = NEW_EVENT(egc, DOMAIN_SHUTDOWN, got->domain);
-
+ libxl_event *ev = NEW_EVENT(egc, DOMAIN_SHUTDOWN,
+ got->domain, evg->user);
+
LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, " shutdown reporting");
ev->u.domain_shutdown.shutdown_reason =
@@ -1141,7 +1142,7 @@ static void disk_eject_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w,
return;
}
- libxl_event *ev = NEW_EVENT(egc, DISK_EJECT, evg->domid);
+ libxl_event *ev = NEW_EVENT(egc, DISK_EJECT, evg->domid, evg->user);
libxl_device_disk *disk = &ev->u.disk_eject.disk;
backend = libxl__xs_read(gc, XBT_NULL,