[for-4.13] libxl: fix device model timeout in libxl__dm_resume()
diff mbox series

Message ID 20191115070414.3862-1-jgross@suse.com
State New
Headers show
Series
  • [for-4.13] libxl: fix device model timeout in libxl__dm_resume()
Related show

Commit Message

Jürgen Groß Nov. 15, 2019, 7:04 a.m. UTC
libxl__dm_resume() is using a wrong timeout for the start of the
device model. Instead of 60 seconds the timeout is set to 60
milliseconds.

Reported-by: Roman Shaposhnik <roman@zededa.com>
Fixes: 6298f0eb8f4437 ("libxl: Re-introduce libxl__domain_resume")
Signed-off-by: Juergen Gross <jgross@suse.com>
---
 tools/libxl/libxl_dom_suspend.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Wei Liu Nov. 15, 2019, 10:26 a.m. UTC | #1
On Fri, Nov 15, 2019 at 08:04:14AM +0100, Juergen Gross wrote:
> libxl__dm_resume() is using a wrong timeout for the start of the
> device model. Instead of 60 seconds the timeout is set to 60
> milliseconds.
> 
> Reported-by: Roman Shaposhnik <roman@zededa.com>
> Fixes: 6298f0eb8f4437 ("libxl: Re-introduce libxl__domain_resume")
> Signed-off-by: Juergen Gross <jgross@suse.com>

Acked-by: Wei Liu <wl@xen.org>
Jürgen Groß Nov. 15, 2019, 10:29 a.m. UTC | #2
On 15.11.19 11:26, Wei Liu wrote:
> On Fri, Nov 15, 2019 at 08:04:14AM +0100, Juergen Gross wrote:
>> libxl__dm_resume() is using a wrong timeout for the start of the
>> device model. Instead of 60 seconds the timeout is set to 60
>> milliseconds.
>>
>> Reported-by: Roman Shaposhnik <roman@zededa.com>
>> Fixes: 6298f0eb8f4437 ("libxl: Re-introduce libxl__domain_resume")
>> Signed-off-by: Juergen Gross <jgross@suse.com>
> 
> Acked-by: Wei Liu <wl@xen.org>
> 

And of course:

Release-acked-by: Juergen Gross <jgross@suse.com>


Juergen

Patch
diff mbox series

diff --git a/tools/libxl/libxl_dom_suspend.c b/tools/libxl/libxl_dom_suspend.c
index 248dbc33e3..35ae337261 100644
--- a/tools/libxl/libxl_dom_suspend.c
+++ b/tools/libxl/libxl_dom_suspend.c
@@ -515,7 +515,7 @@  void libxl__dm_resume(libxl__egc *egc,
     rc = libxl__ev_time_register_rel(dmrs->ao,
                                      &dmrs->time,
                                      dm_resume_timeout,
-                                     LIBXL_DEVICE_MODEL_START_TIMEOUT);
+                                     LIBXL_DEVICE_MODEL_START_TIMEOUT * 1000);
     if (rc) goto out;
 
     switch (libxl__device_model_version_running(gc, domid)) {