]> xenbits.xensource.com Git - people/liuw/xen.git/commitdiff
libxl: fix device model timeout in libxl__dm_resume()
authorJuergen Gross <jgross@suse.com>
Fri, 15 Nov 2019 07:04:14 +0000 (08:04 +0100)
committerWei Liu <wl@xen.org>
Fri, 15 Nov 2019 10:37:44 +0000 (10:37 +0000)
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>
tools/libxl/libxl_dom_suspend.c

index 248dbc33e384ae008e4ab9ce8fb573be06dddd72..35ae337261ba0ac972d1c50d5e3cabf17d3a1f71 100644 (file)
@@ -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)) {