From: Ian Campbell <ian.campbell@citrix.com>
Date: Thu, 1 Mar 2012 12:26:13 +0000 (+0000)
Subject: libxl: use an explicit LIBXL_TIMER_MODE_DEFAULT value
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2d058a444a1fa71ec47a673d08c2e74790ae67fb;p=xen.git

libxl: use an explicit LIBXL_TIMER_MODE_DEFAULT value

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

diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index f14300945a..102fb87ae2 100644
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -245,7 +245,7 @@ typedef LIBXL_TAILQ_ENTRY(struct libxl_event) libxl_ev_link;
 
 typedef struct libxl__ctx libxl_ctx;
 
-#define LIBXL_TIMER_MODE_DEFAULT LIBXL_TIMER_MODE_NO_DELAY_FOR_MISSED_TICKS
+#define LIBXL_TIMER_MODE_DEFAULT -1
 
 #include "_libxl_types.h"
 
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 9601df3a65..62a46c00ea 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -94,7 +94,7 @@ void libxl_domain_build_info_init(libxl_domain_build_info *b_info,
         b_info->u.hvm.viridian = 0;
         b_info->u.hvm.hpet = 1;
         b_info->u.hvm.vpt_align = 1;
-        b_info->u.hvm.timer_mode = 1;
+        b_info->u.hvm.timer_mode = LIBXL_TIMER_MODE_DEFAULT;
         b_info->u.hvm.nested_hvm = 0;
         b_info->u.hvm.no_incr_generationid = 0;
 
@@ -135,6 +135,10 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc,
 
     switch (b_info->type) {
     case LIBXL_DOMAIN_TYPE_HVM:
+        if (b_info->u.hvm.timer_mode == LIBXL_TIMER_MODE_DEFAULT)
+            b_info->u.hvm.timer_mode =
+                LIBXL_TIMER_MODE_NO_DELAY_FOR_MISSED_TICKS;
+
         if (!b_info->u.hvm.boot) {
             b_info->u.hvm.boot = strdup("cda");
             if (!b_info->u.hvm.boot) return ERROR_NOMEM;