From: Ouyang Zhaowei (Charles) <ouyangzhaowei@huawei.com>
Date: Wed, 6 May 2015 01:47:04 +0000 (+0800)
Subject: x86/xen: don't reset vcpu_info on a cancelled suspend
X-Git-Tag: v4.1.12-92~158^2~11^2~31
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5aed3fd822e391f45fb27d68fc7ff32c8d832575;p=users%2Fjedix%2Flinux-maple.git

x86/xen: don't reset vcpu_info on a cancelled suspend

On a cancelled suspend the vcpu_info location does not change (it's
still in the per-cpu area registered by xen_vcpu_setup()).  So do not
call xen_hvm_init_shared_info() which would make the kernel think its
back in the shared info.  With the wrong vcpu_info, events cannot be
received and the domain will hang after a cancelled suspend.

Signed-off-by: Charles Ouyang <ouyangzhaowei@huawei.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
(cherry picked from commit 6a1f513776b78c994045287073e55bae44ed9f8c)
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>

Conflicts:
	arch/x86/xen/suspend.c
---

diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c
index 25bc2e9d36c66..1835f1ad60356 100644
--- a/arch/x86/xen/suspend.c
+++ b/arch/x86/xen/suspend.c
@@ -33,7 +33,8 @@ static void xen_pv_pre_suspend(void)
 static void xen_hvm_post_suspend(int suspend_cancelled)
 {
 #ifdef CONFIG_XEN_PVHVM
-	xen_hvm_init_shared_info();
+	if (!suspend_cancelled)
+	    xen_hvm_init_shared_info();
 	xen_callback_vector();
 	xen_unplug_emulated_devices();
 	xen_vcpu_restore();