libxl: Add LIBXL_EVENT namespace prefix to enum libxl_event_type

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 12d8ef65e573a3341cfd5c5b09decffdf4e924f6..850d80735103018272dc5767fe0467353a0dcdd8 100644 (file)
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -643,7 +643,7 @@ int libxl_get_wait_fd(struct libxl_ctx *ctx, int *fd)
 int libxl_wait_for_domain_death(struct libxl_ctx *ctx, uint32_t domid, libxl_waiter *waiter)
 {
     waiter->path = strdup("@releaseDomain");
-    if (asprintf(&(waiter->token), "%d", DOMAIN_DEATH) < 0)
+    if (asprintf(&(waiter->token), "%d", LIBXL_EVENT_DOMAIN_DEATH) < 0)
         return -1;
     if (!xs_watch(ctx->xsh, waiter->path, waiter->token))
         return -1;
@@ -663,7 +663,7 @@ int libxl_wait_for_disk_ejects(struct libxl_ctx *ctx, uint32_t guest_domid, libx
                      libxl_xs_get_dompath(ctx, domid),
                      device_disk_dev_number(disks[i].virtpath)) < 0)
             return -1;
-        if (asprintf(&(waiter[i].token), "%d", DISK_EJECT) < 0)
+        if (asprintf(&(waiter[i].token), "%d", LIBXL_EVENT_DISK_EJECT) < 0)
             return -1;
         xs_watch(ctx->xsh, waiter->path, waiter->token);
     }
@@ -711,7 +711,7 @@ int libxl_event_get_domain_death_info(struct libxl_ctx *ctx, uint32_t domid, lib
 {
     int rc = 0, ret;
 
-    if (event && event->type == DOMAIN_DEATH) {
+    if (event && event->type == LIBXL_EVENT_DOMAIN_DEATH) {
         ret = xc_domain_getinfolist(ctx->xch, domid, 1, info);
         if (ret == 1 && info->domain == domid) {
                 if (info->flags & XEN_DOMINF_running ||
@@ -730,7 +730,7 @@ out:
 
 int libxl_event_get_disk_eject_info(struct libxl_ctx *ctx, uint32_t domid, libxl_event *event, libxl_device_disk *disk)
 {
-    if (event && event->type == DISK_EJECT) {
+    if (event && event->type == LIBXL_EVENT_DISK_EJECT) {
         char *path;
         char *backend;
         char *value = libxl_xs_read(ctx, XBT_NULL, event->path);

diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index 39a691ce2fcd2517d71e11c997258aade287dd9a..cb250ed53e9a27a6a7cf77a410961e5354bdfcf6 100644 (file)
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -357,8 +357,8 @@ char *libxl_uuid2string(struct libxl_ctx *ctx, uint8_t uuid[16]);
 /* events handling */
 
 typedef enum {
-    DOMAIN_DEATH,
-    DISK_EJECT,
+    LIBXL_EVENT_DOMAIN_DEATH,
+    LIBXL_EVENT_DISK_EJECT,
 } libxl_event_type;
 
 typedef struct {

diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index bb3ebf8d5f551f34488e4bbc80fa72dc73300e72..5f3a6d379f69771c236766c8daae7a5556c4299b 100644 (file)
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -1348,7 +1348,7 @@ start:
             continue;
         libxl_get_event(&ctx, &event);
         switch (event.type) {
-            case DOMAIN_DEATH:
+            case LIBXL_EVENT_DOMAIN_DEATH:
                 if (libxl_event_get_domain_death_info(&ctx, domid, &event, &info)) {
                     LOG("Domain %d is dead", domid);
                     if (info.flags & XEN_DOMINF_dying || (info.flags & XEN_DOMINF_shutdown && (((info.flags >> XEN_DOMINF_shutdownshift) & XEN_DOMINF_shutdownmask) != SHUTDOWN_suspend))) {
@@ -1374,7 +1374,7 @@ start:
                     exit(0);
                 }
                 break;
-            case DISK_EJECT:
+            case LIBXL_EVENT_DISK_EJECT:
                 if (libxl_event_get_disk_eject_info(&ctx, domid, &event, &disk))
                     libxl_cdrom_insert(&ctx, domid, &disk);
                 break;