4.18-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Juergen Gross <jgr...@suse.com>

commit e6111161c0a02d58919d776eec94b313bb57911f upstream.

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: <sta...@vger.kernel.org> # 4.11
Signed-off-by: Juergen Gross <jgr...@suse.com>
Reviewed-by: Boris Ostrovsky <boris.ostrov...@oracle.com>
Signed-off-by: Juergen Gross <jgr...@suse.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 arch/x86/xen/platform-pci-unplug.c |    4 ++++
 1 file changed, 4 insertions(+)

--- a/arch/x86/xen/platform-pci-unplug.c
+++ b/arch/x86/xen/platform-pci-unplug.c
@@ -146,6 +146,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;


Reply via email to