2 files changed, 22 insertions, 11 deletions

diff --git a/arch/x86/xen/enlighten_hvm.c b/arch/x86/xen/enlighten_hvm.c
index 754d5391d9fa..826898701045 100644
--- a/arch/x86/xen/enlighten_hvm.c
+++ b/arch/x86/xen/enlighten_hvm.c
@@ -1,3 +1,4 @@
+#include <linux/acpi.h>
 #include <linux/cpu.h>
 #include <linux/kexec.h>
 #include <linux/memblock.h>
@@ -188,8 +189,6 @@ static void __init xen_hvm_guest_init(void)
         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;
@@ -226,6 +225,26 @@ static uint32_t __init xen_platform_hvm(void)
         return xen_cpuid_base();
 }
 
+static __init void xen_hvm_guest_late_init(void)
+{
+#ifdef CONFIG_XEN_PVH
+        /* Test for PVH domain (PVH boot path taken overrides ACPI flags). */
+        if (!xen_pvh &&
+            (x86_platform.legacy.rtc || !x86_platform.legacy.no_vga))
+                return;
+
+        /* PVH detected. */
+        xen_pvh = true;
+
+        /* Make sure we don't fall back to (default) ACPI_IRQ_MODEL_PIC. */
+        if (!nr_ioapics && acpi_irq_model == ACPI_IRQ_MODEL_PIC)
+                acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM;
+
+        machine_ops.emergency_restart = xen_emergency_restart;
+        pv_info.name = "Xen PVH";
+#endif
+}
+
 const __initconst struct hypervisor_x86 x86_hyper_xen_hvm = {
         .name                   = "Xen HVM",
         .detect                 = xen_platform_hvm,
@@ -233,5 +252,6 @@ const __initconst struct hypervisor_x86 x86_hyper_xen_hvm = {
         .init.init_platform     = xen_hvm_guest_init,
         .init.x2apic_available  = xen_x2apic_para_available,
         .init.init_mem_mapping  = xen_hvm_init_mem_mapping,
+        .init.guest_late_init   = xen_hvm_guest_late_init,
         .runtime.pin_vcpu       = xen_pin_vcpu,
 };
diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/xen/enlighten_pvh.c
index 7bd3ee08393e..436c4f003e17 100644
--- a/arch/x86/xen/enlighten_pvh.c
+++ b/arch/x86/xen/enlighten_pvh.c
@@ -25,13 +25,6 @@ struct boot_params pvh_bootparams __attribute__((section(".data")));
 struct hvm_start_info pvh_start_info;
 unsigned int pvh_start_info_sz = sizeof(pvh_start_info);
 
-static void xen_pvh_arch_setup(void)
-{
-        /* Make sure we don't fall back to (default) ACPI_IRQ_MODEL_PIC. */
-        if (nr_ioapics == 0)
-                acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM;
-}
-
 static void __init init_pvh_bootparams(void)
 {
         struct xen_memory_map memmap;
@@ -102,6 +95,4 @@ void __init xen_prepare_pvh(void)
         wrmsr_safe(msr, (u32)pfn, (u32)(pfn >> 32));
 
         init_pvh_bootparams();
-
-        x86_init.oem.arch_setup = xen_pvh_arch_setup;
 }