summaryrefslogtreecommitdiffstats
path: root/drivers/xen
diff options
context:
space:
mode:
authorOlaf Hering <olaf@aepfle.de>2012-07-10 15:31:39 +0200
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2012-07-19 15:52:03 -0400
commit38ad4f4b6cc713b3c42cb4252688ef5c296d7455 (patch)
treecb88992b4e6181f76bcf293e683616ce38a2184d /drivers/xen
parent254d1a3f02ebc10ccc6e4903394d8d3f484f715e (diff)
downloadop-kernel-dev-38ad4f4b6cc713b3c42cb4252688ef5c296d7455.zip
op-kernel-dev-38ad4f4b6cc713b3c42cb4252688ef5c296d7455.tar.gz
xen: enable platform-pci only in a Xen guest
While debugging kexec issues in a PVonHVM guest I modified xen_hvm_platform() to return false to disable all PV drivers. This caused a crash in platform_pci_init() because it expects certain data structures to be initialized properly. To avoid such a crash make sure the driver is initialized only if running in a Xen guest. Signed-off-by: Olaf Hering <olaf@aepfle.de> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/platform-pci.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/xen/platform-pci.c b/drivers/xen/platform-pci.c
index 2389e58..97ca359 100644
--- a/drivers/xen/platform-pci.c
+++ b/drivers/xen/platform-pci.c
@@ -109,6 +109,9 @@ static int __devinit platform_pci_init(struct pci_dev *pdev,
long mmio_addr, mmio_len;
unsigned int max_nr_gframes;
+ if (!xen_domain())
+ return -ENODEV;
+
i = pci_enable_device(pdev);
if (i)
return i;
OpenPOWER on IntegriCloud