# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1280246226 -3600
# Node ID 60f0ba74e18f58949be9e1c075ce2786011831f0
# Parent e017930af272c888f2a562f842af4e142a973d5f
libxl: Add LIBXL_EVENT namespace prefix to enum libxl_event_type
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
tools/libxl/libxl.c | 8 ++++----
tools/libxl/libxl.h | 4 ++--
tools/libxl/xl_cmdimpl.c | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff -r e017930af272 -r 60f0ba74e18f tools/libxl/libxl.c
--- a/tools/libxl/libxl.c Tue Jul 27 16:53:00 2010 +0100
+++ b/tools/libxl/libxl.c Tue Jul 27 16:57:06 2010 +0100
@@ -643,7 +643,7 @@ int libxl_wait_for_domain_death(struct l
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 li
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(st
{
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 -r e017930af272 -r 60f0ba74e18f tools/libxl/libxl.h
--- a/tools/libxl/libxl.h Tue Jul 27 16:53:00 2010 +0100
+++ b/tools/libxl/libxl.h Tue Jul 27 16:57:06 2010 +0100
@@ -357,8 +357,8 @@ char *libxl_uuid2string(struct libxl_ctx
/* events handling */
typedef enum {
- DOMAIN_DEATH,
- DISK_EJECT,
+ LIBXL_EVENT_DOMAIN_DEATH,
+ LIBXL_EVENT_DISK_EJECT,
} libxl_event_type;
typedef struct {
diff -r e017930af272 -r 60f0ba74e18f tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c Tue Jul 27 16:53:00 2010 +0100
+++ b/tools/libxl/xl_cmdimpl.c Tue Jul 27 16:57:06 2010 +0100
@@ -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;
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home