diff options
author | Juergen Gross <jgross@suse.com> | 2018-10-25 09:54:15 +0200 |
---|---|---|
committer | Juergen Gross <jgross@suse.com> | 2018-10-26 09:16:57 +0200 |
commit | e6111161c0a02d58919d776eec94b313bb57911f (patch) | |
tree | bdb7efdd36ef96a22f93f0daf848a77ed8443d5e /arch/x86/xen | |
parent | 769d6bfc74c1f02333dd5f9a438df3346aded56f (diff) | |
download | linux-stable-e6111161c0a02d58919d776eec94b313bb57911f.tar.gz linux-stable-e6111161c0a02d58919d776eec94b313bb57911f.tar.bz2 linux-stable-e6111161c0a02d58919d776eec94b313bb57911f.zip |
xen/pvh: don't try to unplug emulated devices
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>
Diffstat (limited to 'arch/x86/xen')
-rw-r--r-- | arch/x86/xen/platform-pci-unplug.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/xen/platform-pci-unplug.c b/arch/x86/xen/platform-pci-unplug.c index 66ab96a4e2b3..96d7f7d39cb9 100644 --- a/arch/x86/xen/platform-pci-unplug.c +++ b/arch/x86/xen/platform-pci-unplug.c @@ -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; |