Merge branch 'for-3.4/drivers' of git://git.kernel.dk/linux-block

[cascardo/linux.git] / drivers / block / xen-blkfront.c

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 5d9c559..4e86393 100644 (file)
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -1474,6 +1474,9 @@ static int __init xlblk_init(void)
        if (!xen_domain())
                return -ENODEV;
 
+       if (xen_hvm_domain() && !xen_platform_pci_unplug)
+               return -ENODEV;
+
        if (register_blkdev(XENVBD_MAJOR, DEV_NAME)) {
                printk(KERN_WARNING "xen_blk: can't get major %d with name %s\n",
                       XENVBD_MAJOR, DEV_NAME);