From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Wed, 15 Jul 2015 13:35:56 +0000 (+0100)
Subject: libxl: events: Do not abort remus with ERROR_TIMEOUT
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2768
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0c90a8d25a2cfe91ceec0729c2238c911768a0bf;p=xen.git

libxl: events: Do not abort remus with ERROR_TIMEOUT

When the timeout set for prompting the next remus iteration fires, we
should not treat the ERROR_TIMEDOUT as an error.

Bug in 31c836f4 "libxl: events: Permit timeouts to signal ao abort".

Reported-by: Yang Hongyang <yanghy@cn.fujitsu.com>
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Yang Hongyang <yanghy@cn.fujitsu.com>
CC: Wei Liu <wei.liu2@citrix.com>
CC: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Yang Hongyang <yanghy@cn.fujitsu.com>
---

diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c
index 81adb3d532..4cb247a685 100644
--- a/tools/libxl/libxl_dom.c
+++ b/tools/libxl/libxl_dom.c
@@ -2024,6 +2024,9 @@ static void remus_next_checkpoint(libxl__egc *egc, libxl__ev_time *ev,
 
     STATE_AO_GC(dss->ao);
 
+    if (rc == ERROR_TIMEDOUT) /* As intended */
+        rc = 0;
+
     /*
      * Time to checkpoint the guest again. We return 1 to libxc
      * (xc_domain_save.c). in order to continue executing the infinite loop