From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Mon, 11 Apr 2016 12:20:04 +0000 (+0200)
Subject: libxl/save: set domain_suspend_state->domid in do_domain_soft_reset()
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~1281
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=33fce488cdd983bec5a68f0385f225098b294a9d;p=xen.git

libxl/save: set domain_suspend_state->domid in do_domain_soft_reset()

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

diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 65123bc73a..5000bd011a 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -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);