Commit 6a1f5137 authored by Ouyang Zhaowei (Charles)'s avatar Ouyang Zhaowei (Charles) Committed by David Vrabel
Browse files

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: default avatarCharles Ouyang <>
Reviewed-by: default avatarBoris Ostrovsky <>
Cc: <>
Signed-off-by: default avatarDavid Vrabel <>
parent b9c0a92a
......@@ -33,7 +33,8 @@ static void xen_hvm_post_suspend(int suspend_cancelled)
int cpu;
if (!suspend_cancelled)
if (xen_feature(XENFEAT_hvm_safe_pvclock)) {
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment