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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 29 Jan 2016 05:49:28 +0000 (21:49 -0800)
commitc55958f9a88de41d7e145e146fea4d4fcf0a4be2
tree302dbeb43a2f279351ee531e721f7cd99124ddc1
parent723e01b02a017a2c2889202487a20c778f1f0bd6
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/xen/suspend.c