xen/pvh: PVH guests always have PV devices

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
OraBug: 26662731

(cherry picked from commit bcc57df281d93dfa502c824e9f73e0191c3f7c34)
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Joao Martins <joao.m.martins@oracle.com>

diff --git a/arch/x86/xen/platform-pci-unplug.c b/arch/x86/xen/platform-pci-unplug.c
index 90d1b83cf35f2ae72f7bde1b63fcbb2c9fb219ec..33a783c77d969ecb5c76b841e13aa2ac19ad0da5 100644 (file)
--- a/arch/x86/xen/platform-pci-unplug.c
+++ b/arch/x86/xen/platform-pci-unplug.c
@@ -73,8 +73,8 @@ bool xen_has_pv_devices(void)
        if (!xen_domain())
                return false;
 
-       /* PV domains always have them. */
-       if (xen_pv_domain())
+       /* PV and PVH domains always have them. */
+       if (xen_pv_domain() || xen_pvh_domain())
                return true;
 
        /* And user has xen_platform_pci=0 set in guest config as