libxl/save: set domain_suspend_state->domid in do_domain_soft_reset()
authorVitaly Kuznetsov <vkuznets@redhat.com>
Mon, 11 Apr 2016 12:20:04 +0000 (14:20 +0200)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 15 Apr 2016 10:59:22 +0000 (11:59 +0100)
c/s d5c693d "libxl/save: Refactor libxl__domain_suspend_state" broke soft
reset as libxl__domain_suspend_device_model() now fails when domid in not set
in libxl__domain_suspend_state.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>
tools/libxl/libxl_create.c

index 65123bc73a9f091ea9823abe9038c9ca9b4488a0..5000bd011a41b3122e2d64d5a06e762d4fe36164 100644 (file)
@@ -1829,7 +1829,7 @@ static int do_domain_soft_reset(libxl_ctx *ctx,
     free(xs_console_mfn);
 
     dss->ao = ao;
-    dss->domid = domid_soft_reset;
+    dss->domid = dss->dsps.domid = domid_soft_reset;
     dss->dsps.dm_savefile = GCSPRINTF(LIBXL_DEVICE_MODEL_SAVE_FILE".%d",
                                       domid_soft_reset);