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/block | |
| 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/block')
| -rw-r--r-- | drivers/block/xen-blkfront.c | 2 |
1 files changed, 1 insertions, 1 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) | |||
| 1452 | if (!xen_domain()) | 1452 | if (!xen_domain()) |
| 1453 | return -ENODEV; | 1453 | return -ENODEV; |
| 1454 | 1454 | ||
| 1455 | if (!xen_platform_pci_unplug) | 1455 | if (xen_hvm_domain() && !xen_platform_pci_unplug) |
| 1456 | return -ENODEV; | 1456 | return -ENODEV; |
| 1457 | 1457 | ||
| 1458 | if (register_blkdev(XENVBD_MAJOR, DEV_NAME)) { | 1458 | if (register_blkdev(XENVBD_MAJOR, DEV_NAME)) { |