diff options
| author | Boris Ostrovsky <boris.ostrovsky@oracle.com> | 2017-02-06 10:58:06 -0500 |
|---|---|---|
| committer | Boris Ostrovsky <boris.ostrovsky@oracle.com> | 2017-02-07 08:07:01 -0500 |
| commit | 7a1c44ebc5ac2e2c28d95b0da6060728c334e7e4 (patch) | |
| tree | 622a9686beed22f2b2f05b115233771ed5fbafba /arch/x86/xen/enlighten.c | |
| parent | 2a7197f02dddf1f9cee300bd12512375ed56524a (diff) | |
| download | blackbird-obmc-linux-7a1c44ebc5ac2e2c28d95b0da6060728c334e7e4.tar.gz blackbird-obmc-linux-7a1c44ebc5ac2e2c28d95b0da6060728c334e7e4.zip | |
xen/pvh: Use Xen's emergency_restart op for PVH guests
Using native_machine_emergency_restart (called during reboot) will
lead PVH guests to machine_real_restart() where we try to use
real_mode_header which is not initialized.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Diffstat (limited to 'arch/x86/xen/enlighten.c')
| -rw-r--r-- | arch/x86/xen/enlighten.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 6d406f3465bc..ec1d5c46e58f 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1924,6 +1924,9 @@ static void __init xen_hvm_guest_init(void) x86_init.irqs.intr_init = xen_init_IRQ; xen_hvm_init_time_ops(); xen_hvm_init_mmu_ops(); + + if (xen_pvh_domain()) + machine_ops.emergency_restart = xen_emergency_restart; #ifdef CONFIG_KEXEC_CORE machine_ops.shutdown = xen_hvm_shutdown; machine_ops.crash_shutdown = xen_hvm_crash_shutdown; |
