diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2012-03-27 19:31:08 +0200 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-04-06 12:12:52 -0400 |
| commit | e95ae5a4939c52ccab02a49238d5d15d492b2598 (patch) | |
| tree | 0b531cd78d48bc56d4046201094e164db7982d4e | |
| parent | df7a3ee29b775edd1c2d75cf0b128b174bd4091e (diff) | |
| download | kernel-common-e95ae5a4939c52ccab02a49238d5d15d492b2598.tar.gz kernel-common-e95ae5a4939c52ccab02a49238d5d15d492b2598.tar.bz2 kernel-common-e95ae5a4939c52ccab02a49238d5d15d492b2598.zip | |
xen: only check xen_platform_pci_unplug if hvm
commit b9136d207f08
xen: initialize platform-pci even if xen_emul_unplug=never
breaks blkfront/netfront by not loading them because of
xen_platform_pci_unplug=0 and it is never set for PV guest.
Signed-off-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
| -rw-r--r-- | drivers/block/xen-blkfront.c | 2 | ||||
| -rw-r--r-- | drivers/net/xen-netfront.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 4276ab035e00..19b6005a323e 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -1452,7 +1452,7 @@ static int __init xlblk_init(void) if (!xen_domain()) return -ENODEV; - if (!xen_platform_pci_unplug) + if (xen_hvm_domain() && !xen_platform_pci_unplug) return -ENODEV; if (register_blkdev(XENVBD_MAJOR, DEV_NAME)) { diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 8cc0914b9f92..ccba19c72a36 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -1957,7 +1957,7 @@ static int __init netif_init(void) if (xen_initial_domain()) return 0; - if (!xen_platform_pci_unplug) + if (xen_hvm_domain() && !xen_platform_pci_unplug) return -ENODEV; printk(KERN_INFO "Initialising Xen virtual ethernet driver.\n"); |