x86/xen: don't reset vcpu_info on a cancelled suspend
authorOuyang Zhaowei (Charles) <ouyangzhaowei@huawei.com>
Wed, 6 May 2015 01:47:04 +0000 (09:47 +0800)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 13 Feb 2016 10:34:07 +0000 (10:34 +0000)
commit8b0969157ef3d3db0ba4541b5f4ec399f5fddccd
tree3411e07bd04edddf41e87fe7ab3ff2f39bbf3583
parentc1e4a82572edd68dcbfa0a695cca486723e3ea2d
x86/xen: don't reset vcpu_info on a cancelled suspend

commit 6a1f513776b78c994045287073e55bae44ed9f8c upstream.

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>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
arch/x86/xen/suspend.c