]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
xen/pvh: don't try to unplug emulated devices
authorJuergen Gross <jgross@suse.com>
Thu, 25 Oct 2018 07:54:15 +0000 (09:54 +0200)
committerJuergen Gross <jgross@suse.com>
Fri, 26 Oct 2018 07:16:57 +0000 (09:16 +0200)
A Xen PVH guest has no associated qemu device model, so trying to
unplug any emulated devices is making no sense at all.

Bail out early from xen_unplug_emulated_devices() when running as PVH
guest. This will avoid issuing the boot message:

[    0.000000] Xen Platform PCI: unrecognised magic value

Cc: <stable@vger.kernel.org> # 4.11
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
arch/x86/xen/platform-pci-unplug.c

index 66ab96a4e2b3e28a41c78fa7bbbbef0bc2e85064..96d7f7d39cb917a0957403aaf59ec8d6339af9a4 100644 (file)
@@ -134,6 +134,10 @@ void xen_unplug_emulated_devices(void)
 {
        int r;
 
+       /* PVH guests don't have emulated devices. */
+       if (xen_pvh_domain())
+               return;
+
        /* user explicitly requested no unplug */
        if (xen_emul_unplug & XEN_UNPLUG_NEVER)
                return;