libxl: Made it possible to use 'timer='delay_for_missed_ticks'
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 25 Feb 2013 16:30:18 +0000 (11:30 -0500)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 26 Feb 2013 16:16:17 +0000 (16:16 +0000)
The assertion only allows values of 1 (no_delay_for_missed_ticks)
up to 3 (one_missed_tick_pending). It should be possible to
use the value of 0 (delay_for_missed_ticks) for the timer configuration
option.

Acked-by: Ian Campbell <ian.cambell@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
tools/libxl/libxl_dom.c

index e1cd9a4b2b457ba07d1a3f3e2c1ef03f7b309a6e..de555eedd95d0e5f38364b3997272f654b8beca4 100644 (file)
@@ -417,7 +417,7 @@ out:
 static unsigned long timer_mode(const libxl_domain_build_info *info)
 {
     const libxl_timer_mode mode = info->u.hvm.timer_mode;
-    assert(mode != LIBXL_TIMER_MODE_DELAY_FOR_MISSED_TICKS &&
+    assert(mode >= LIBXL_TIMER_MODE_DELAY_FOR_MISSED_TICKS &&
            mode <= LIBXL_TIMER_MODE_ONE_MISSED_TICK_PENDING);
     return ((unsigned long)mode);
 }