From: Juergen Gross <jgross@suse.com>
Date: Fri, 15 Nov 2019 07:04:14 +0000 (+0100)
Subject: libxl: fix device model timeout in libxl__dm_resume()
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~1182
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f43afb079031d90a7810dce380ad0d224b895ea3;p=xen.git

libxl: fix device model timeout in libxl__dm_resume()

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>
Release-acked-by: Juergen Gross <jgross@suse.com>
---

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)) {