diff options
| author | Ouyang Zhaowei (Charles) <ouyangzhaowei@huawei.com> | 2015-05-05 21:47:04 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2016-01-04 06:49:25 -0500 |
| commit | 6a1f513776b78c994045287073e55bae44ed9f8c (patch) | |
| tree | 8b57b75283438e0ecc7b57dc550af24389d20f17 /arch/x86/xen | |
| parent | b9c0a92a9aa953e5a98f2af2098c747d4358c7bb (diff) | |
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>
Diffstat (limited to 'arch/x86/xen')
| -rw-r--r-- | arch/x86/xen/suspend.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c index 3705eabd7e22..5df55833b529 100644 --- a/arch/x86/xen/suspend.c +++ b/arch/x86/xen/suspend.c | |||
| @@ -33,7 +33,8 @@ static void xen_hvm_post_suspend(int suspend_cancelled) | |||
| 33 | { | 33 | { |
| 34 | #ifdef CONFIG_XEN_PVHVM | 34 | #ifdef CONFIG_XEN_PVHVM |
| 35 | int cpu; | 35 | int cpu; |
| 36 | xen_hvm_init_shared_info(); | 36 | if (!suspend_cancelled) |
| 37 | xen_hvm_init_shared_info(); | ||
| 37 | xen_callback_vector(); | 38 | xen_callback_vector(); |
| 38 | xen_unplug_emulated_devices(); | 39 | xen_unplug_emulated_devices(); |
| 39 | if (xen_feature(XENFEAT_hvm_safe_pvclock)) { | 40 | if (xen_feature(XENFEAT_hvm_safe_pvclock)) { |