From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Date: Thu, 23 Apr 2015 02:49:18 +0000 (-0400)
Subject: tools/libxc: Set HVM_PARAM_CONSOLE_EVTCHN during restore
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3350
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=125c3c05a9a25e1d00405c08fda432b0ce5606b1;p=xen.git

tools/libxc: Set HVM_PARAM_CONSOLE_EVTCHN during restore

When resuming, the guest needs to check whether the port has changed. HVM
guests use this parameter to get the port number.

(We can't always use xenstore where this value is also written: for example
on Linux the console is resumed very early, before the store is up).

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c
index 2ab9f4689e..f9dfd2d0f8 100644
--- a/tools/libxc/xc_domain_restore.c
+++ b/tools/libxc/xc_domain_restore.c
@@ -2328,7 +2328,10 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom,
                                     HVM_PARAM_PAE_ENABLED, pae))
          || (frc = xc_hvm_param_set(xch, dom,
                                     HVM_PARAM_STORE_EVTCHN,
-                                    store_evtchn)) )
+                                    store_evtchn))
+         || (frc = xc_hvm_param_set(xch, dom,
+                                    HVM_PARAM_CONSOLE_EVTCHN,
+                                    console_evtchn)) )
     {
         PERROR("error setting HVM params: %i", frc);
         goto out;