diff options
| author |   Olaf Hering <olaf@aepfle.de> | 2012-07-10 15:31:39 +0200 |
|---|---|---|
| committer |   Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-07-19 15:52:03 -0400 |
| commit | 38ad4f4b6cc713b3c42cb4252688ef5c296d7455 (patch) | |
| tree | cb88992b4e6181f76bcf293e683616ce38a2184d /drivers/xen/platform-pci.c | |
| parent | xen/pv-on-hvm kexec: shutdown watches from old kernel (diff) | |
| download | linux-dev-38ad4f4b6cc713b3c42cb4252688ef5c296d7455.tar.xz linux-dev-38ad4f4b6cc713b3c42cb4252688ef5c296d7455.zip | |
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/platform-pci.c')
| -rw-r--r-- | drivers/xen/platform-pci.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/xen/platform-pci.c b/drivers/xen/platform-pci.c index 2389e581e23c..97ca359ae2bd 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; |