]> xenbits.xensource.com Git - people/tklengyel/xen.git/commitdiff
tools/libs/light: fix xl save -c handling
authorJuergen Gross <jgross@suse.com>
Fri, 19 Feb 2021 14:13:37 +0000 (15:13 +0100)
committerAndrew Cooper <andrew.cooper3@citrix.com>
Fri, 19 Feb 2021 17:52:41 +0000 (17:52 +0000)
libxl_domain_resume() won't work correctly for the case it was called
due to a "xl save -c" command, i.e. to continue the suspended domain.

The information to do that is not saved in libxl__dm_resume_state for
non-HVM domains.

Fixes: 6298f0eb8f443 ("libxl: Re-introduce libxl__domain_resume")
Reported-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Tested-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Acked-by: Wei Liu <wl@xen.org>
tools/libs/light/libxl_dom_suspend.c

index 25d1571895f8df266f28563fdd6ddd36e96e4fe3..f7823bbc8ff8b1820b01bf0981de0f577bfa238b 100644 (file)
@@ -630,12 +630,13 @@ void libxl__domain_resume(libxl__egc *egc,
         goto out;
     }
 
+    dmrs->suspend_cancel = suspend_cancel;
+
     if (type != LIBXL_DOMAIN_TYPE_HVM) {
         rc = 0;
         goto out;
     }
 
-    dmrs->suspend_cancel = suspend_cancel;
     dmrs->dm_resumed_callback = domain_resume_done;
     libxl__dm_resume(egc, dmrs); /* must be last */
     return;