diff options
author | Igor Mammedov <imammedo@redhat.com> | 2012-03-27 13:31:08 -0400 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-04-06 12:12:52 -0400 |
commit | e95ae5a4939c52ccab02a49238d5d15d492b2598 (patch) | |
tree | 0b531cd78d48bc56d4046201094e164db7982d4e /drivers/net/xen-netfront.c | |
parent | df7a3ee29b775edd1c2d75cf0b128b174bd4091e (diff) |
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>
Diffstat (limited to 'drivers/net/xen-netfront.c')
-rw-r--r-- | drivers/net/xen-netfront.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) | |||
1957 | if (xen_initial_domain()) | 1957 | if (xen_initial_domain()) |
1958 | return 0; | 1958 | return 0; |
1959 | 1959 | ||
1960 | if (!xen_platform_pci_unplug) | 1960 | if (xen_hvm_domain() && !xen_platform_pci_unplug) |
1961 | return -ENODEV; | 1961 | return -ENODEV; |
1962 | 1962 | ||
1963 | printk(KERN_INFO "Initialising Xen virtual ethernet driver.\n"); | 1963 | printk(KERN_INFO "Initialising Xen virtual ethernet driver.\n"); |