Xen devel - Feb 2013 - [PATCH] libxl: Made it possible to use 'timer='delay_for_missed_ticks'

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 1 (delay_for_missed_ticks) for the timer configuration
option.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
 tools/libxl/libxl_dom.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c
index e1cd9a4..de555ee 100644
--- a/tools/libxl/libxl_dom.c
+++ b/tools/libxl/libxl_dom.c
@@ -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);
 }
-- 
1.8.0.2

On Mon, 2013-02-25 at 16:33 +0000, Konrad Rzeszutek Wilk
wrote:
> 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 1 (delay_for_missed_ticks) for the timer configuration
> option.
Doh! That was very likely a brainfart by me...
> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Ian Campbell <ian.cambell@citrix.com>
> ---
>  tools/libxl/libxl_dom.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c
> index e1cd9a4..de555ee 100644
> --- a/tools/libxl/libxl_dom.c
> +++ b/tools/libxl/libxl_dom.c
> @@ -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);
>  }

On Mon, Feb 25, 2013 at 04:43:10PM +0000, Ian Campbell
wrote:
> On Mon, 2013-02-25 at 16:33 +0000, Konrad Rzeszutek Wilk wrote:
> > 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 1 (delay_for_missed_ticks) for the timer
configuration
                     ^- 0
> > option.
> 
> Doh! That was very likely a brainfart by me...
And by me in the git commit description :-(
> 
> > Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> 
> Acked-by: Ian Campbell <ian.cambell@citrix.com>

From 4f7bd24184f98b4cf53cd8a24b89829c17ca3d1d Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Mon, 25 Feb 2013 11:30:18 -0500
Subject: [PATCH] libxl: Made it possible to use
 ''timer=''delay_for_missed_ticks''

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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c
index e1cd9a4..de555ee 100644
--- a/tools/libxl/libxl_dom.c
+++ b/tools/libxl/libxl_dom.c
@@ -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);
 }
-- 
1.8.0.2

Konrad Rzeszutek Wilk writes ("Re: [Xen-devel] [PATCH] libxl: Made it
possible to use
''timer=''delay_for_missed_ticks''"):
> On Mon, Feb 25, 2013 at 04:43:10PM +0000, Ian Campbell wrote:
> > Doh! That was very likely a brainfart by me...
> 
> And by me in the git commit description :-(
Heh.
> From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Date: Mon, 25 Feb 2013 11:30:18 -0500
> Subject: [PATCH] libxl: Made it possible to use
>  ''timer=''delay_for_missed_ticks''
> 
> 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>
Applied, thanks.

Ian.